Merge remote-tracking branch 'internal/main'

IBM · May 31, 2024 · ff1eb85 · ff1eb85
2 parents f3b4194 + e1ea06c
commit ff1eb85
Show file tree

Hide file tree

Showing 40 changed files with 1,848 additions and 105 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
+## 1.16.0
+
+### Features
+
+- Users can now create Power VS Shared Processor Pools from the `/form/powerSharedPools` page
+- Users can now create Power VS Placement Groups from the `/form/powerPlacemetGroups` page
+- FalconStor VTL now dynamically retrieves available machine types based on the zone selected
+
+### Fixes
+
+- Fixed an issue causing CIDR blocks and IP addressess ending in a number 200 or greater to be incorrectly flagged as invalid
+
 ## 1.15.6
 
 ### Upgrade Notes

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.15.6",
+  "version": "1.16.0",
   "private": true,
   "license": "Apache-2.0",
   "scripts": {
@@ -26,7 +26,7 @@
     "html-to-image": "^1.11.11",
     "json-to-tf": "^0.3.1",
     "jszip": "^3.10.1",
-    "lazy-z": "1.12.0",
+    "lazy-z": "1.12.1",
     "react": "^18.0.0",
     "react-chartjs-2": "^5.2.0",
     "react-dom": "^18.0.0",

diff --git a/client/src/components/page-template/PageTemplate.js b/client/src/components/page-template/PageTemplate.js
@@ -47,6 +47,8 @@ import {
   SecurityServices,
   InstanceClassic,
   IbmCloudBareMetalServer,
+  GroupObjects,
+  ScreenMapSet,
 } from "@carbon/icons-react";
 import f5 from "../../images/f5.png";
 import {
@@ -71,6 +73,8 @@ function F5Icon() {
 const releaseNotes = require("../../lib/docs/release-notes.json");
 const navCategories = require("../../lib/nav-catagories");
 const navIcons = {
+  ScreenMapSet: ScreenMapSet,
+  GroupObjects: GroupObjects,
   IbmCloudKeyProtect: IbmCloudKeyProtect,
   ObjectStorage: ObjectStorage,
   VirtualPrivateCloud: VirtualPrivateCloud,

diff --git a/client/src/components/pages/CraigForms.js b/client/src/components/pages/CraigForms.js
@@ -1122,6 +1122,8 @@ function craigForms(craig) {
         {
           sap: craig.power_instances.sap,
           sap_profile: craig.power_instances.sap_profile,
+          pi_shared_processor_pool:
+            craig.power_instances.pi_shared_processor_pool,
         },
         {
           name: craig.power_instances.name,
@@ -1144,14 +1146,15 @@ function craigForms(craig) {
           pi_processors: craig.power_instances.pi_processors,
           pi_memory: craig.power_instances.pi_memory,
         },
+        {
+          pi_health_status: craig.power_instances.pi_health_status,
+          pi_placement_group_id: craig.power_instances.pi_placement_group_id,
+        },
         {
           pi_ibmi_css: craig.power_instances.pi_ibmi_css,
           pi_ibmi_pha: craig.power_instances.pi_ibmi_pha,
           pi_ibmi_rds_users: craig.power_instances.pi_ibmi_rds_users,
         },
-        {
-          pi_health_status: craig.power_instances.pi_health_status,
-        },
         {
           heading: {
             name: "Boot Volume",
@@ -1190,6 +1193,34 @@ function craigForms(craig) {
         },
       ],
     },
+    power_placement_groups: {
+      groups: [
+        {
+          name: craig.power_placement_groups.name,
+          workspace: craig.power_placement_groups.workspace,
+        },
+        {
+          pi_placement_group_policy:
+            craig.power_placement_groups.pi_placement_group_policy,
+        },
+      ],
+    },
+    power_shared_processor_pools: {
+      groups: [
+        {
+          name: craig.power_shared_processor_pools.name,
+          workspace: craig.power_shared_processor_pools.workspace,
+        },
+        {
+          pi_shared_processor_pool_reserved_cores:
+            craig.power_shared_processor_pools
+              .pi_shared_processor_pool_reserved_cores,
+          pi_shared_processor_pool_host_group:
+            craig.power_shared_processor_pools
+              .pi_shared_processor_pool_host_group,
+        },
+      ],
+    },
     power_volumes: {
       groups: [
         {

diff --git a/client/src/components/pages/FormPages.js b/client/src/components/pages/FormPages.js
@@ -830,6 +830,43 @@ const PowerVsInstances = (craig) => {
   });
 };
 
+const PowerVsPlacementGroups = (craig) => {
+  return formPageTemplate(craig, {
+    name: "Power VS Placement Groups",
+    addText: "Create a Group",
+    jsonField: "power_placement_groups",
+    overrideTile: !craig.store.json._options.enable_power_vs ? (
+      <NoPowerNetworkTile />
+    ) : craig.store.json.power.length === 0 ? (
+      <NoPowerWorkspaceTile />
+    ) : undefined,
+    hideFormTitleButton:
+      !craig.store.json._options.enable_power_vs ||
+      craig.store.json.power.length === 0,
+    formName: "Power VS PlacementGroups",
+  });
+};
+
+const PowerVsSharedPools = (craig) => {
+  return formPageTemplate(craig, {
+    name: "Power VS Shared Processor Pools",
+    addText: "Create a Pool",
+    jsonField: "power_shared_processor_pools",
+    overrideTile: !craig.store.json._options.enable_power_vs ? (
+      <NoPowerNetworkTile />
+    ) : craig.store.json.power.length === 0 ? (
+      <NoPowerWorkspaceTile />
+    ) : undefined,
+    hideFormTitleButton:
+      !craig.store.json._options.enable_power_vs ||
+      craig.store.json.power.length === 0,
+    formName: "Power VS Shared Processor Pools",
+    innerFormProps: {
+      powerStoragePoolMap: powerStoragePoolRegionMap,
+    },
+  });
+};
+
 const PowerVsVolumes = (craig) => {
   return formPageTemplate(craig, {
     name: "Power VS Storage Volumes",
@@ -1399,6 +1436,10 @@ export const NewFormPage = (props) => {
     return PowerInfraPage(craig);
   } else if (form === "powerInstances") {
     return PowerVsInstances(craig);
+  } else if (form === "powerPlacementGroups") {
+    return PowerVsPlacementGroups(craig);
+  } else if (form === "powerSharedPools") {
+    return PowerVsSharedPools(craig);
   } else if (form === "powerVolumes") {
     return PowerVsVolumes(craig);
   } else if (form === "resourceGroups") {

diff --git a/client/src/lib/constants.js b/client/src/lib/constants.js
@@ -51,7 +51,10 @@ module.exports = {
           exp
             .group((exp) => exp.set("a-z0-9-").or().literal("\\").any())
             .anyNumber()
-            .set("a-z0-9");
+            .set("a-z0-9")
+            .or()
+            .literal("\\")
+            .any();
         })
         .anyNumber();
     })

diff --git a/client/src/lib/docs/docs.json b/client/src/lib/docs/docs.json
@@ -2536,5 +2536,21 @@
       ]
     ],
     "last_updated": "3/20/2024"
+  },
+  "power_shared_processor_pools": {
+    "content": [
+      {
+        "text": "NYI"
+      }
+    ],
+    "relatedLinks": []
+  },
+  "power_placement_groups": {
+    "content": [
+      {
+        "text": "NYI"
+      }
+    ],
+    "relatedLinks": []
   }
 }
diff --git a/client/src/lib/docs/release-notes.json b/client/src/lib/docs/release-notes.json
@@ -1,4 +1,16 @@
 [
+  {
+    "version": "1.16.0",
+    "features": [
+      "Users can now create Power VS Shared Processor Pools from the `/form/powerSharedPools` page",
+      "Users can now create Power VS Placement Groups from the `/form/powerPlacemetGroups` page",
+      "FalconStor VTL now dynamically retrieves available machine types based on the zone selected"
+    ],
+    "fixes": [
+      "Fixed an issue causing CIDR blocks and IP addressess ending in a number 200 or greater to be incorrectly flagged as invalid"
+    ],
+    "upgrade_notes": []
+  },
   {
     "version": "1.15.6",
     "features": [

diff --git a/client/src/lib/docs/templates/oracle-rac.json b/client/src/lib/docs/templates/oracle-rac.json
@@ -11,7 +11,7 @@
     "dynamic_subnets": false,
     "enable_power_vs": true,
     "power_vs_zones": ["dal12", "dal10", "us-south"],
-    "craig_version": "1.15.6",
+    "craig_version": "1.16.0",
     "power_vs_high_availability": false,
     "no_vpn_secrets_manager_auth": false,
     "power_vs_ha_zone_1": null,
@@ -315,7 +315,9 @@
       "pi_user_data": null,
       "pi_pin_policy": "none",
       "pi_license_repository_capacity": null,
-      "index": 0
+      "index": 0,
+      "pi_shared_processor_pool": "None",
+      "pi_placement_group_id": "None"
     },
     {
       "name": "oracle-2",
@@ -361,7 +363,9 @@
       "pi_user_data": null,
       "pi_pin_policy": "none",
       "pi_license_repository_capacity": null,
-      "index": 1
+      "index": 1,
+      "pi_shared_processor_pool": "None",
+      "pi_placement_group_id": "None"
     }
   ],
   "power_volumes": [

diff --git a/client/src/lib/docs/templates/oracle-si.json b/client/src/lib/docs/templates/oracle-si.json
@@ -10,7 +10,7 @@
     "dynamic_subnets": false,
     "enable_power_vs": true,
     "power_vs_zones": ["dal12", "dal10", "us-south"],
-    "craig_version": "1.15.6",
+    "craig_version": "1.16.0",
     "power_vs_high_availability": false,
     "no_vpn_secrets_manager_auth": false,
     "enable_classic": false,
@@ -283,7 +283,9 @@
       "pi_user_data": null,
       "pi_pin_policy": "none",
       "pi_license_repository_capacity": null,
-      "index": 0
+      "index": 0,
+      "pi_shared_processor_pool": "None",
+      "pi_placement_group_id": "None"
     }
   ],
   "power_volumes": [

diff --git a/client/src/lib/docs/templates/power-poc-quick-start.json b/client/src/lib/docs/templates/power-poc-quick-start.json
@@ -10,7 +10,7 @@
     "enable_power_vs": true,
     "enable_classic": false,
     "power_vs_zones": ["dal10"],
-    "craig_version": "1.15.6",
+    "craig_version": "1.16.0",
     "power_vs_high_availability": false,
     "template": "Power VS POC",
     "fs_cloud": false,
@@ -312,7 +312,9 @@
       "pi_ibmi_pha": false,
       "pi_ibmi_rds_users": null,
       "pi_pin_policy": "none",
-      "pi_license_repository_capacity": null
+      "pi_license_repository_capacity": null,
+      "pi_shared_processor_pool": "None",
+      "pi_placement_group_id": "None"
     },
     {
       "sap": false,
@@ -350,7 +352,9 @@
       "pi_ibmi_rds_users": null,
       "pi_pin_policy": "none",
       "pi_license_repository_capacity": null,
-      "pi_health_status": "OK"
+      "pi_health_status": "OK",
+      "pi_shared_processor_pool": "None",
+      "pi_placement_group_id": "None"
     }
   ],
   "power_volumes": [