Added infra-core submodule for infra open API spec (#557)

riyaz-ghati · web-flow · commit 723481985b3f · 2026-02-26T13:23:39.000+05:30
diff --git a/.eslintignore b/.eslintignore
@@ -5,3 +5,4 @@ index.js
 library/apis
 library/@spark-design
 library/@orch-utils
+library/@infra-core
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "library/@orch-utils"]
 	path = library/@orch-utils
 	url = https://github.com/open-edge-platform/orch-utils.git
+[submodule "library/@infra-core"]
+	path = library/@infra-core
+	url = https://github.com/open-edge-platform/infra-core.git
diff --git a/.prettierignore b/.prettierignore
@@ -28,3 +28,4 @@ library/utils/mocks/app-orch/index.ts
 library/utils/mocks/app-orch/adm/index.ts
 library/@spark-design
 library/@orch-utils
+library/@infra-core
diff --git a/apps/cluster-orch/src/components/organism/cluster/clusterCreation/SelectSite/SelectSite.tsx b/apps/cluster-orch/src/components/organism/cluster/clusterCreation/SelectSite/SelectSite.tsx
@@ -57,7 +57,7 @@ const SelectSite = ({
   const { data: preSelectedSite, isLoading } = infra.useSiteServiceGetSiteQuery(
     {
       projectName: SharedStorage.project?.name ?? "",
-      regionResourceId: preRegionId ?? "*",
+      regionId: preRegionId ?? "*",
       resourceId: preSiteId ?? "",
     },
     { skip: !preSiteId || !SharedStorage.project?.name },
diff --git a/apps/cluster-orch/src/components/pages/ClusterDetail/ClusterDetail.tsx b/apps/cluster-orch/src/components/pages/ClusterDetail/ClusterDetail.tsx
@@ -163,7 +163,7 @@ function ClusterDetail({ hasHeader = true, name }: ClusterDetailProps) {
   const { data: siteData } = infra.useSiteServiceGetSiteQuery(
     {
       projectName: SharedStorage.project?.name ?? "",
-      regionResourceId: "*", // Cluster or associated host have no region information
+      regionId: "*", // Cluster or associated host have no region information
       resourceId: siteId ?? "",
     },
     { skip: !siteId || !SharedStorage.project?.name },
diff --git a/apps/cluster-orch/src/components/pages/ClusterEdit/ClusterEdit.tsx b/apps/cluster-orch/src/components/pages/ClusterEdit/ClusterEdit.tsx
@@ -104,7 +104,7 @@ const ClusterEdit = ({ HostsTableRemote }: ClusterEditProps) => {
   const { data: siteData } = infra.useSiteServiceGetSiteQuery(
     {
       projectName: SharedStorage.project?.name ?? "",
-      regionResourceId: "*", // Cluster or associated host have no region information
+      regionId: "*", // Cluster or associated host have no region information
       resourceId: siteId && siteId.length > 0 ? siteId : "",
     },
     { skip: !siteId || !SharedStorage.project?.name },
diff --git a/apps/infra/src/components/atom/SiteCell/SiteCell.tsx b/apps/infra/src/components/atom/SiteCell/SiteCell.tsx
@@ -23,7 +23,7 @@ const SiteCell = ({ siteId, regionId = "*" }: SiteCellProps) => {
     isError,
   } = infra.useSiteServiceGetSiteQuery(
     {
-      regionResourceId: regionId,
+      regionId,
       projectName: SharedStorage.project?.name ?? "",
       resourceId: siteId!,
     },
diff --git a/apps/infra/src/components/molecules/locations/TelemetryProfileLogs/TelemetryProfileLogs.pom.ts b/apps/infra/src/components/molecules/locations/TelemetryProfileLogs/TelemetryProfileLogs.pom.ts
@@ -21,7 +21,7 @@ type ApiAliases =
   | "getRegionTelemetryLogsEmpty"
   | "getRegionTelemetryLogs500";
 
-const regionUrl = "**/logprofiles?regionId=region-1.0";
+const regionUrl = "**/profiles/logs?regionId=region-1.0";
 export const regionTelemetryLogResponse: infra.TelemetryLogsProfileServiceListTelemetryLogsProfilesApiResponse =
   {
     telemetryLogsProfiles: [
@@ -39,7 +39,7 @@ export const regionTelemetryLogResponse: infra.TelemetryLogsProfileServiceListTe
     totalElements: 1,
   };
 const endpoints: CyApiDetails<ApiAliases> = {
-  getRegionTelemetryLogs: { route: "**/logprofiles*", statusCode: 200 },
+  getRegionTelemetryLogs: { route: "**/profiles/logs*", statusCode: 200 },
   getRegionTelemetryLogsMocked: {
     route: regionUrl,
     statusCode: 200,
diff --git a/apps/infra/src/components/molecules/locations/TelemetryProfileLogs/TelemetryProfileLogs.tsx b/apps/infra/src/components/molecules/locations/TelemetryProfileLogs/TelemetryProfileLogs.tsx
@@ -20,7 +20,6 @@ export const TelemetryProfileLogs = ({
   const cy = { "data-cy": dataCy };
   const args: infra.TelemetryLogsProfileServiceListTelemetryLogsProfilesApiArg =
     {
-      resourceId: "group-id", //TODO: evaluate
       projectName: SharedStorage.project?.name ?? "",
       ...(region
         ? { regionId: region.resourceId }
diff --git a/apps/infra/src/components/molecules/locations/TelemetryProfileMetrics/TelemetryProfileMetrics.pom.ts b/apps/infra/src/components/molecules/locations/TelemetryProfileMetrics/TelemetryProfileMetrics.pom.ts
@@ -21,7 +21,7 @@ type ApiAliases =
   | "getRegionTelemetryMetricsEmpty"
   | "getRegionTelemetryMetrics500";
 
-const regionMetricsUrl = "**/metricprofiles?regionId=region-1.0";
+const regionMetricsUrl = "**/profiles/metrics?regionId=region-1.0";
 export const regionTelemetryMetricsResponse: infra.TelemetryMetricsProfileServiceListTelemetryMetricsProfilesApiResponse =
   {
     telemetryMetricsProfiles: [
@@ -40,7 +40,7 @@ export const regionTelemetryMetricsResponse: infra.TelemetryMetricsProfileServic
   };
 
 const endpoints: CyApiDetails<ApiAliases> = {
-  getRegionTelemetryMetrics: { route: "**/metricprofiles*", statusCode: 200 },
+  getRegionTelemetryMetrics: { route: "**/profiles/metrics*", statusCode: 200 },
   getRegionTelemetryMetricsMocked: {
     route: regionMetricsUrl,
     statusCode: 200,
diff --git a/apps/infra/src/components/molecules/locations/TelemetryProfileMetrics/TelemetryProfileMetrics.tsx b/apps/infra/src/components/molecules/locations/TelemetryProfileMetrics/TelemetryProfileMetrics.tsx
@@ -20,7 +20,6 @@ export const TelemetryProfileMetrics = ({
   const cy = { "data-cy": dataCy };
   const args: infra.TelemetryMetricsProfileServiceListTelemetryMetricsProfilesApiArg =
     {
-      resourceId: "group-id", //TODO: evaluate
       projectName: SharedStorage.project?.name ?? "",
       ...(region
         ? { regionId: region.resourceId }
diff --git a/apps/infra/src/components/organism/RegisterHostDrawer/RegisterHostDrawer.pom.ts b/apps/infra/src/components/organism/RegisterHostDrawer/RegisterHostDrawer.pom.ts
@@ -20,7 +20,7 @@ type ApiAliases = "postRegisterHost200" | "patchRegisterHost200";
 export const endpoints: CyApiDetails<ApiAliases> = {
   postRegisterHost200: {
     method: "POST",
-    route: "**/compute/hosts/register",
+    route: "**/compute/hosts/register**",
     statusCode: 200,
   },
   patchRegisterHost200: {
diff --git a/apps/infra/src/components/organism/locations/RegionSiteTree/RegionSiteTree.tsx b/apps/infra/src/components/organism/locations/RegionSiteTree/RegionSiteTree.tsx
@@ -130,7 +130,7 @@ export const RegionSiteTree = ({
     {
       projectName: SharedStorage.project?.name ?? "",
       orderBy: ORDER_BY,
-      resourceId: currentRegionId ?? "",
+      regionId: currentRegionId ?? "",
       filter: `region.resourceId="${currentRegionId}"`,
     },
     {
diff --git a/apps/infra/src/components/organism/locations/SiteView/SiteView.tsx b/apps/infra/src/components/organism/locations/SiteView/SiteView.tsx
@@ -31,7 +31,7 @@ export const SiteView = ({ basePath, hideActions = false }: SiteViewProps) => {
     {
       projectName: SharedStorage.project?.name ?? "",
       resourceId: siteFromRedux?.resourceId ?? "",
-      regionResourceId: siteFromRedux?.region?.resourceId ?? "",
+      regionId: siteFromRedux?.region?.resourceId ?? "",
     },
     {
       skip:
diff --git a/apps/infra/src/components/organism/site/SitesDropdown/SitesDropdown.tsx b/apps/infra/src/components/organism/site/SitesDropdown/SitesDropdown.tsx
@@ -34,7 +34,7 @@ const SitesDropdown = ({
     {
       projectName,
       pageSize,
-      resourceId: regionId,
+      regionId,
     },
     { skip: disable || !projectName }, // Skip call if component is disabled
   );
diff --git a/apps/infra/src/components/pages/HostDetails/HostDetails.tsx b/apps/infra/src/components/pages/HostDetails/HostDetails.tsx
@@ -115,7 +115,7 @@ const HostDetails: React.FC = () => {
   const sitesQuery = infra.useSiteServiceListSitesQuery(
     {
       projectName: SharedStorage.project?.name ?? "",
-      resourceId: "*", // sitesFiltered logic can be updated with host regionId mapping
+      regionId: "*", // sitesFiltered logic can be updated with host regionId mapping
       pageSize: 100,
     },
     {
diff --git a/apps/infra/src/components/pages/HostEdit.tsx b/apps/infra/src/components/pages/HostEdit.tsx
@@ -116,7 +116,7 @@ const HostEdit = () => {
       // IMPORTANT: we used the "rid" fallback to pass anything else than empty string
       // for 24.11 api requires any non-empty value to return the site data
       // currently the host object does not contain the data about region
-      regionResourceId: host?.site?.region?.resourceId ?? "rid",
+      regionId: host?.site?.region?.resourceId ?? "rid",
       projectName: SharedStorage.project?.name ?? "",
       resourceId: host?.site?.siteID ?? "",
     },
@@ -169,7 +169,7 @@ const HostEdit = () => {
       {
         projectName: SharedStorage.project?.name ?? "",
         filter: `region.resourceId='${selectedRegion?.resourceId ?? ""}'`,
-        resourceId: selectedRegion?.resourceId ?? "",
+        regionId: selectedRegion?.resourceId ?? "",
       },
       { skip: !host || !selectedRegion?.resourceId },
     );
diff --git a/apps/infra/src/components/pages/HostProvision/host-provision.utils.ts b/apps/infra/src/components/pages/HostProvision/host-provision.utils.ts
@@ -195,7 +195,7 @@ export const useProvisioning = () => {
 
         const { data: site } = await getSite({
           projectName: SharedStorage.project?.name ?? "",
-          regionResourceId: "*",
+          regionId: "*",
           resourceId: host.site?.siteID as string,
         });
 
diff --git a/apps/infra/src/components/pages/Locations/Locations.tsx b/apps/infra/src/components/pages/Locations/Locations.tsx
@@ -131,7 +131,7 @@ export const Locations = () => {
 
   const deleteSiteHandler = (siteId: string) => {
     deleteSite({
-      regionResourceId: siteToDelete?.region?.resourceId ?? "",
+      regionId: siteToDelete?.region?.resourceId ?? "",
       projectName: SharedStorage.project?.name ?? "",
       resourceId: siteId,
     })
diff --git a/apps/infra/src/components/pages/region/RegionForm.tsx b/apps/infra/src/components/pages/region/RegionForm.tsx
@@ -132,7 +132,6 @@ const RegionForm: React.FC = () => {
     isLoading: profileMetricLoading,
   } = infra.useTelemetryMetricsProfileServiceListTelemetryMetricsProfilesQuery(
     {
-      resourceId: "group-id", //TODO: evaluate
       projectName: SharedStorage.project?.name ?? "",
       regionId: regionId,
     },
@@ -149,7 +148,6 @@ const RegionForm: React.FC = () => {
     isLoading: profileLogLoading,
   } = infra.useTelemetryLogsProfileServiceListTelemetryLogsProfilesQuery(
     {
-      resourceId: "group-id", //TODO: evaluate
       projectName: SharedStorage.project?.name ?? "",
       regionId: regionId,
     },
@@ -399,7 +397,6 @@ const RegionForm: React.FC = () => {
         if (metricPair.profileId != "") {
           allPromises.push(
             editMetricProfile({
-              metricgroupResourceId: "group-id", //TODO: evaluate
               projectName: SharedStorage.project?.name ?? "",
               resourceId: metricPair.profileId,
               telemetryMetricsProfileResource: metricProfile,
@@ -408,7 +405,6 @@ const RegionForm: React.FC = () => {
         } else {
           allPromises.push(
             createMetricProfile({
-              resourceId: "group-id", //TODO: evaluate
               projectName: SharedStorage.project?.name ?? "",
               telemetryMetricsProfileResource: metricProfile,
             }),
@@ -427,7 +423,6 @@ const RegionForm: React.FC = () => {
         if (logPair.profileId != "") {
           allPromises.push(
             editLogProfile({
-              loggroupResourceId: "group-id", //TODO: evaluate
               projectName: SharedStorage.project?.name ?? "",
               resourceId: logPair.profileId,
               telemetryLogsProfileResource: logProfile,
@@ -436,7 +431,6 @@ const RegionForm: React.FC = () => {
         } else {
           allPromises.push(
             createLogProfile({
-              resourceId: "group-id", //TODO: evaluate
               projectName: SharedStorage.project?.name ?? "",
               telemetryLogsProfileResource: logProfile,
             }),
@@ -456,7 +450,6 @@ const RegionForm: React.FC = () => {
           ) {
             allPromises.push(
               deleteMetricProfile({
-                metricgroupResourceId: "group-id", //TODO: evaluate
                 projectName: SharedStorage.project?.name ?? "",
                 resourceId: responsePair.profileId,
               }),
@@ -472,7 +465,6 @@ const RegionForm: React.FC = () => {
           ) {
             allPromises.push(
               deleteLogProfile({
-                loggroupResourceId: "group-id", //TODO: not used in real endpoint
                 projectName: SharedStorage.project?.name ?? "",
                 resourceId: responsePair.profileId,
               }),
diff --git a/apps/infra/src/components/pages/site/SiteForm.tsx b/apps/infra/src/components/pages/site/SiteForm.tsx
@@ -77,7 +77,7 @@ const SiteForm = () => {
     error,
   } = infra.useSiteServiceGetSiteQuery(
     {
-      regionResourceId: regionId ?? "", //TODO: not used in EIM endpoint
+      regionId: regionId ?? "",
       projectName: SharedStorage.project?.name ?? "",
       resourceId: siteId,
     },
@@ -102,7 +102,6 @@ const SiteForm = () => {
     isLoading: profileMetricLoading,
   } = infra.useTelemetryMetricsProfileServiceListTelemetryMetricsProfilesQuery(
     {
-      resourceId: "group-id", //TODO: check if its right ?
       projectName: SharedStorage.project?.name ?? "",
       siteId: siteId,
     },
@@ -119,7 +118,6 @@ const SiteForm = () => {
     isLoading: profileLogLoading,
   } = infra.useTelemetryLogsProfileServiceListTelemetryLogsProfilesQuery(
     {
-      resourceId: "group-id", //TODO: check if its right ?
       projectName: SharedStorage.project?.name ?? "",
       siteId: siteId,
     },
@@ -273,7 +271,7 @@ const SiteForm = () => {
   // reset form registered defaultValue when API response returns to check field sanity
   useEffect(() => {
     const defaultValue: infra.SiteServiceUpdateSiteApiArg = {
-      regionResourceId: regionId ?? "", //TODO: not used in real endpoint
+      regionId: regionId ?? "",
       projectName: SharedStorage.project?.name ?? "",
       resourceId: siteId,
       siteResource: {
@@ -356,13 +354,13 @@ const SiteForm = () => {
 
       if (siteId === "new") {
         siteOperation = createSite({
-          resourceId: site.regionId!,
+          regionId: site.regionId!,
           projectName: SharedStorage.project?.name ?? "",
           siteResource: site,
         }).unwrap();
       } else {
         siteOperation = updateSite({
-          regionResourceId: site.regionId!,
+          regionId: site.regionId!,
           projectName: SharedStorage.project?.name ?? "",
           resourceId: siteId,
           siteResource: site,
@@ -383,7 +381,6 @@ const SiteForm = () => {
         if (metricPair.profileId != "") {
           allPromises.push(
             editMetricProfile({
-              metricgroupResourceId: "group-id", //TODO: not used in real endpoint,
               projectName: SharedStorage.project?.name ?? "",
               resourceId: metricPair.profileId,
               telemetryMetricsProfileResource: metricProfile,
@@ -392,7 +389,6 @@ const SiteForm = () => {
         } else {
           allPromises.push(
             createMetricProfile({
-              resourceId: "group-id", //TODO: evaluate
               projectName: SharedStorage.project?.name ?? "",
               telemetryMetricsProfileResource: metricProfile,
             }),
@@ -411,7 +407,6 @@ const SiteForm = () => {
         if (logPair.profileId != "") {
           allPromises.push(
             editLogProfile({
-              loggroupResourceId: "group-id", //TODO: not used in real endpoint
               projectName: SharedStorage.project?.name ?? "",
               resourceId: logPair.profileId,
               telemetryLogsProfileResource: logProfile,
@@ -420,7 +415,6 @@ const SiteForm = () => {
         } else {
           allPromises.push(
             createLogProfile({
-              resourceId: "group-id", //TODO: evaluate
               projectName: SharedStorage.project?.name ?? "",
               telemetryLogsProfileResource: logProfile,
             }),
@@ -440,7 +434,6 @@ const SiteForm = () => {
           ) {
             allPromises.push(
               deleteMetricProfile({
-                metricgroupResourceId: "group-id", //TODO: evaluate
                 projectName: SharedStorage.project?.name ?? "",
                 resourceId: responsePair.profileId,
               }),
@@ -455,7 +448,6 @@ const SiteForm = () => {
             )
           ) {
             deleteLogProfile({
-              loggroupResourceId: "group-id", //TODO: evaluate
               projectName: SharedStorage.project?.name ?? "",
               resourceId: responsePair.profileId,
             });
diff --git a/apps/infra/src/utils/TelemetryApis.ts b/apps/infra/src/utils/TelemetryApis.ts
@@ -15,7 +15,7 @@ export const telemetryProfilesMetricsEndpoints: CyApiDetails<
   infra.TelemetryMetricsProfileServiceListTelemetryMetricsProfilesApiResponse
 > = {
   getTelemetryProfilesMetricsMocked: {
-    route: `${baseRoute}metricgroups/**/metricprofiles?*`,
+    route: `${baseRoute}profiles/metrics?*`,
     response: {
       telemetryMetricsProfiles: [],
       totalElements: 0,
@@ -30,7 +30,7 @@ export const telemetryProfilesLogsEndpoints: CyApiDetails<
   infra.TelemetryLogsProfileServiceListTelemetryLogsProfilesApiResponse
 > = {
   getTelemetryProfilesLogsMocked: {
-    route: `${baseRoute}loggroups/**/logprofiles?*`,
+    route: `${baseRoute}/profiles/logs?*`,
     response: { telemetryLogsProfiles: [], totalElements: 0, hasNext: false },
   },
 };
diff --git a/apps/root/src/utils/helpers.ts b/apps/root/src/utils/helpers.ts
@@ -179,7 +179,7 @@ export const getSite = async (
   } = await dispatch(
     infra.infra.endpoints.siteServiceGetSite.initiate({
       resourceId: siteId,
-      regionResourceId: "*", // host have no region information
+      regionId: "*", // host have no region information
       projectName: SharedStorage.project?.name ?? "",
     }),
   );
diff --git a/library/.eslintignore b/library/.eslintignore
@@ -6,3 +6,4 @@
 apis
 @spark-design
 @orch-utils
+@infra-core
diff --git a/library/.prettierignore b/library/.prettierignore
@@ -8,3 +8,4 @@ utils/mocks/app-orch/index.ts
 utils/mocks/app-orch/adm/index.ts
 @spark-design
 @orch-utils
+@infra-core
diff --git a/library/@infra-core b/library/@infra-core
@@ -0,0 +1 @@
+Subproject commit 98bf130ee7a3b7f3fca3a14e7bfa0aac57cc2d2f
diff --git a/library/apis/infra/infra.ts b/library/apis/infra/infra.ts
diff --git a/library/apis/infra/infraApis.config.json b/library/apis/infra/infraApis.config.json
diff --git a/library/utils/global/eim/global.ts b/library/utils/global/eim/global.ts
diff --git a/library/utils/mocks/infra/mocks.ts b/library/utils/mocks/infra/mocks.ts
diff --git a/library/utils/mocks/infra/store/instances.ts b/library/utils/mocks/infra/store/instances.ts
diff --git a/library/utils/mocks/infra/store/osUpdatePolicy.ts b/library/utils/mocks/infra/store/osUpdatePolicy.ts
diff --git a/library/utils/mocks/infra/store/osresources.ts b/library/utils/mocks/infra/store/osresources.ts
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ const SelectSite = ({`
`57`	`57`	`const { data: preSelectedSite, isLoading } = infra.useSiteServiceGetSiteQuery(`
`58`	`58`	`{`
`59`	`59`	`projectName: SharedStorage.project?.name ?? "",`
`60`		`- regionResourceId: preRegionId ?? "*",`
	`60`	`+ regionId: preRegionId ?? "*",`
`61`	`61`	`resourceId: preSiteId ?? "",`
`62`	`62`	`},`
`63`	`63`	`{ skip: !preSiteId \|\| !SharedStorage.project?.name },`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ function ClusterDetail({ hasHeader = true, name }: ClusterDetailProps) {`
`163`	`163`	`const { data: siteData } = infra.useSiteServiceGetSiteQuery(`
`164`	`164`	`{`
`165`	`165`	`projectName: SharedStorage.project?.name ?? "",`
`166`		`- regionResourceId: "*", // Cluster or associated host have no region information`
	`166`	`+ regionId: "*", // Cluster or associated host have no region information`
`167`	`167`	`resourceId: siteId ?? "",`
`168`	`168`	`},`
`169`	`169`	`{ skip: !siteId \|\| !SharedStorage.project?.name },`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ const ClusterEdit = ({ HostsTableRemote }: ClusterEditProps) => {`
`104`	`104`	`const { data: siteData } = infra.useSiteServiceGetSiteQuery(`
`105`	`105`	`{`
`106`	`106`	`projectName: SharedStorage.project?.name ?? "",`
`107`		`- regionResourceId: "*", // Cluster or associated host have no region information`
	`107`	`+ regionId: "*", // Cluster or associated host have no region information`
`108`	`108`	`resourceId: siteId && siteId.length > 0 ? siteId : "",`
`109`	`109`	`},`
`110`	`110`	`{ skip: !siteId \|\| !SharedStorage.project?.name },`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ const SiteCell = ({ siteId, regionId = "*" }: SiteCellProps) => {`
`23`	`23`	`isError,`
`24`	`24`	`} = infra.useSiteServiceGetSiteQuery(`
`25`	`25`	`{`
`26`		`- regionResourceId: regionId,`
	`26`	`+ regionId,`
`27`	`27`	`projectName: SharedStorage.project?.name ?? "",`
`28`	`28`	`resourceId: siteId!,`
`29`	`29`	`},`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ export const TelemetryProfileLogs = ({`
`20`	`20`	`const cy = { "data-cy": dataCy };`
`21`	`21`	`const args: infra.TelemetryLogsProfileServiceListTelemetryLogsProfilesApiArg =`
`22`	`22`	`{`
`23`		`- resourceId: "group-id", //TODO: evaluate`
`24`	`23`	`projectName: SharedStorage.project?.name ?? "",`
`25`	`24`	`...(region`
`26`	`25`	`? { regionId: region.resourceId }`