diff --git a/pages/access/service/[serviceId].js b/pages/access/service/[serviceId].js index 590793f8..6bf20c94 100644 --- a/pages/access/service/[serviceId].js +++ b/pages/access/service/[serviceId].js @@ -279,6 +279,13 @@ function MarketplaceService() { (instance) => instance.kubernetesDashboardEndpoint ); + const isMultiTenancy = useMemo( + () => + service?.productTierType === productTierTypes.OMNISTRATE_MULTI_TENANCY, + + [service] + ); + const handleViewAccountConfigInstructions = (row) => { setViewInstructionsItem(row); const result_params = row.result_params; @@ -938,7 +945,11 @@ function MarketplaceService() { } } - if (!isCloudProvider || isCustomNetworkEnabled) { + if ( + !isCloudProvider || + isMultiTenancy || + !service?.supportsPublicNetwork + ) { delete data["network_type"]; } @@ -2024,6 +2035,7 @@ function MarketplaceService() { gcp: service?.gcpRegions || [], }} isCustomNetworkEnabled={isCustomNetworkEnabled} + isMultiTenancy={isMultiTenancy} /> } /> diff --git a/src/components/Forms/CreateResourceInstanceForm.jsx b/src/components/Forms/CreateResourceInstanceForm.jsx index f0d13855..a2b12d08 100644 --- a/src/components/Forms/CreateResourceInstanceForm.jsx +++ b/src/components/Forms/CreateResourceInstanceForm.jsx @@ -65,6 +65,7 @@ function CreateResourceInstanceForm(props) { service, subscriptionId, isCustomNetworkEnabled = false, + isMultiTenancy, } = props; const [isSchemaLoading, setIsSchemaLoading] = useState(true); @@ -234,7 +235,7 @@ function CreateResourceInstanceForm(props) { const networkTypeFieldExists = cloudProviderFieldExists && - !isCustomNetworkEnabled && + !isMultiTenancy && service?.supportsPublicNetwork; if (isSchemaLoading)