Sap hana enhancements (#1560)

* updated SAP Hana template based on feedback * prettier formatting * updated server.js to allow larger tarball * prettier formatting * updated sap template json * updated json to iac to remove primary subnet value from terraform output * updated SAP HANA teplate to fix reference to SG RG * prettier formatting * updated template to use PER dal10 zone, removed references of my SSH key * prettier formatting * updated power volumes attachments * updated SAP HANA draw.io template based on enhancements/fixes * updated sap hana drawio diagram to have horizontal vpc boxes * updated sap hana png, fixed cropping * resolved ACL port chart display for source_port min/max values * capitalized SAP HANA template image and references * updated release notes and version # to 1.11.2 * updated version number in client/package.json, prettier formatting * updated version number in client/package.json, prettier formatting * update release notes with v1.11.2 notes, missing some fixes still in progress * updated acl rule chart for ports to check for null string * refined release notes, added notes for Sam's PR #1568 to avoid merge conflicts * refined release notes, included deploy script fixes and upgrades * remove sapHanaPattern.png, will re-add * added SapHanaPattern.png fixed capitalization * updated pattern includes section of SAP HANA to include Public Gateway addition * prettier formatting * updated SAP Hana template based on feedback * prettier formatting * updated server.js to allow larger tarball * prettier formatting * updated sap template json * updated json to iac to remove primary subnet value from terraform output * updated SAP HANA teplate to fix reference to SG RG * prettier formatting * updated template to use PER dal10 zone, removed references of my SSH key * prettier formatting * updated power volumes attachments * updated SAP HANA draw.io template based on enhancements/fixes * updated sap hana drawio diagram to have horizontal vpc boxes * updated sap hana png, fixed cropping * resolved ACL port chart display for source_port min/max values * capitalized SAP HANA template image and references * updated release notes and version # to 1.11.2 * updated version number in client/package.json, prettier formatting * updated version number in client/package.json, prettier formatting * update release notes with v1.11.2 notes, missing some fixes still in progress * updated acl rule chart for ports to check for null string * remove sapHanaPattern.png, will re-add * added SapHanaPattern.png fixed capitalization * updated pattern includes section of SAP HANA to include Public Gateway addition * prettier formatting * prettier * added missing schematics7 ACL rule to mgmt VPC after IP address fix --------- Co-authored-by: Jennifer-Valle <Jennifer.Valle@ibm.com>
IBM · Feb 23, 2024 · fbe9ba9 · fbe9ba9
1 parent 92acd40
commit fbe9ba9
Show file tree

Hide file tree

Showing 10 changed files with 3,576 additions and 1,011 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ All notable changes to this project will be documented in this file.
 
 ### Upgrade Notes
 
+- SAP Hana Template now uses RHEL VSI images
+
 ### Features
 
 - When attempting to create a resource that requires an SSH Key using the V2 pages, users will now be directed to first create an SSH key instead of viewing the form
@@ -18,15 +20,17 @@ All notable changes to this project will be documented in this file.
 - Fixed an issue causing CIDR blocks and IP addresses to be incorrectly marked as invalid
 - Fixed an issue causing SSH Keys to incorrectly display as invalid on V2 pages when using the same public key for VPC, Power, or Classic
 - Fixed an issue causing invalid VPC VSI images to persist after removing references when importing a project
-
+- Fixed an issue casing TCP and UDP networking rules with no specified port to be rendered incorrectly when using the data view
+- Fixed an issue causing some large craig.json files to not be able to generate Terraform files
 
 ## 1.11.1
 
 ### Upgrade Notes
 
-- CRAIG Terraform no longer uses the depricated field `pi_network_jumbo`. Existing networks with `pi_network_jumbo` selected will be converted to use `pi_network_mtu`.
+- CRAIG Terraform no longer uses the depricated field `pi_network_jumbo`. Existing networks with `pi_network_jumbo` selected will be converted to use `pi_network_mtu`
 - CRAIG no longer supports variable `validation` block within Terraform. This was causing some issues when importing into schematics
 - Default VPC Security Group and Network ACLs now are secure by default and include no networking rules
+- Updated the Power VS PoC template and documentation for successful Power VS and on-prem networking
 
 ### Features
 

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "craig",
-  "version": "1.10.0",
+  "version": "1.11.2",
   "private": true,
   "license": "Apache-2.0",
   "scripts": {

diff --git a/client/src/components/forms/network-rules-order-card/OrderCardDataTable.js b/client/src/components/forms/network-rules-order-card/OrderCardDataTable.js
@@ -64,6 +64,9 @@ function setupRowsAndHeaders(componentProps) {
         ? "ALL"
         : row.protocol === "icmp"
         ? row.icmp.code
+        : contains(["null", null], row[row.protocol].port_min) ||
+          contains(["null", null], row[row.protocol].port_max)
+        ? "ALL"
         : `${row[row.protocol].port_min}-${row[row.protocol].port_max}`;
     delete row.icmp;
     delete row.tcp;

diff --git a/client/src/components/utils/composed-templates.js b/client/src/components/utils/composed-templates.js
@@ -1,7 +1,7 @@
 import MixedPattern from "../../images/mixed.png";
 import VsiPattern from "../../images/VsiPattern.png";
 import VsiEdgePattern from "../../images/VsiEdgePattern.png";
-import PowerSAP_HanaPattern from "../../images/PowerSAP_HanaPattern.png";
+import SapHanaPattern from "../../images/SapHanaPattern.png";
 import OracleRac from "../../images/oracle-rac.png";
 import Empty from "../../images/empty.png";
 import PowerVsQuickStart from "../../images/quick-start-power.png";
@@ -15,7 +15,7 @@ const templateImages = {
   Mixed: MixedPattern,
   VSI: VsiPattern,
   "VSI Edge": VsiEdgePattern,
-  "Power VS SAP Hana": PowerSAP_HanaPattern,
+  "Power VS SAP Hana": SapHanaPattern,
   "Power VS Oracle Ready": OracleRac,
   "Empty Project": Empty,
   "Power VS Quick Start": PowerVsQuickStart,

diff --git a/client/src/images/SapHanaPattern.png b/client/src/images/SapHanaPattern.png
diff --git a/client/src/lib/constants.js b/client/src/lib/constants.js
@@ -915,6 +915,7 @@ module.exports = {
         "A dns-server Virtual Server instance deployment in the workload VPC",
         "A proxy-server Virtual Server instance deployment in the transit VPC",
         "A VPN Gateway in the Management VPC",
+        "A Public Gateway in the Transit VPC",
       ],
     },
     "Power VS Oracle Ready": {

diff --git a/client/src/lib/docs/release-notes.json b/client/src/lib/docs/release-notes.json
@@ -10,9 +10,11 @@
       "Fixed an issue causing Power VS Workspace deploy scripts to fail in schematics",
       "Fixed an issue causing CIDR blocks and IP addresses to be incorrectly marked as invalid",
       "Fixed an issue causing SSH Keys to incorrectly display as invalid on V2 pages when using the same public key for VPC, Power, or Classic",
-      "Fixed an issue causing invalid VPC VSI images to persist after removing references when importing a project"
+      "Fixed an issue causing invalid VPC VSI images to persist after removing references when importing a project",
+      "Fixed an issue casing TCP and UDP networking rules with no specified port to be rendered incorrectly when using the data view",
+      "Fixed an issue causing some large craig.json files to not be able to generate Terraform files"
     ],
-    "upgrade_notes": []
+    "upgrade_notes": ["SAP Hana Template now uses RHEL VSI images"]
   },
   {
     "version": "1.11.1",
@@ -38,9 +40,10 @@
       "Fixed an issue causing VPN Gateways with no selected subnet to not be rendered as part of the v2 VPC Deployments page"
     ],
     "upgrade_notes": [
-      "CRAIG Terraform no longer uses the depricated field `pi_network_jumbo`. Existing networks with `pi_network_jumbo` selected will be converted to use `pi_network_mtu`.",
+      "CRAIG Terraform no longer uses the depricated field `pi_network_jumbo`. Existing networks with `pi_network_jumbo` selected will be converted to use `pi_network_mtu`",
       "CRAIG no longer supports variable `validation` block within Terraform. This was causing some issues when importing into schematics",
-      "Default VPC Security Group and Network ACLs now are secure by default and include no networking rules"
+      "Default VPC Security Group and Network ACLs now are secure by default and include no networking rules",
+      "Updated the Power VS PoC template and documentation for successful Power VS and on-prem networking"
     ]
   },
   {