MGMT-15903 Fix config ini format

TheRealJon · Dec 14, 2023 · 8281c37 · 8281c37
1 parent e8aa70c
commit 8281c37
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/frontend/packages/vsphere-plugin/__tests__/__snapshots__/utils.spec.ts.snap b/frontend/packages/vsphere-plugin/__tests__/__snapshots__/utils.spec.ts.snap
@@ -12,6 +12,7 @@ server=https://1.2.3.4/something
 datacenter=my-datacenter
 default-datastore=my-default-ds
 folder=/my/folder
+resourcepool-path=/my-datacenter/host/foo-cluster/Resources
 
 [VirtualCenter "https://1.2.3.4/something"]
 datacenters=my-datacenter
@@ -28,6 +29,7 @@ server=https://1.2.3.4/something
 datacenter=my-datacenter
 default-datastore=my-default-ds
 folder=/my/folder
+resourcepool-path=/my-datacenter/host/foo-cluster/Resources
 
 [VirtualCenter \\"https://1.2.3.4/something\\"]
 datacenters=my-datacenter
@@ -45,6 +47,7 @@ server=https://1.2.3.4/something
 datacenter=my-datacenter
 default-datastore=my-default-ds
 folder=/my/folder
+resourcepool-path=/my-datacenter/host/foo-cluster/Resources
 
 [VirtualCenter \\"https://1.2.3.4/something\\"]
 datacenters=my-datacenter

diff --git a/frontend/packages/vsphere-plugin/src/components/persist.ts b/frontend/packages/vsphere-plugin/src/components/persist.ts
@@ -130,7 +130,7 @@ const persistProviderConfigMap = async (
   config: ConnectionFormContextValues,
   cloudProviderConfig?: ConfigMap,
 ): Promise<string | undefined> => {
-  const { vcenter, datacenter, defaultDatastore, folder } = config;
+  const { vcenter, datacenter, defaultDatastore, folder, vCenterCluster } = config;
 
   if (cloudProviderConfig) {
     const configIniString = mergeCloudProviderConfig(
@@ -172,6 +172,7 @@ server = "${vcenter}"
 datacenter = "${datacenter}"
 default-datastore = "${defaultDatastore}"
 folder = "${folder}"
+resourcepool-path = "/${datacenter}/host/${vCenterCluster}/Resources"
 
 [VirtualCenter "${vcenter}"]
 datacenters = "${datacenter}"

diff --git a/frontend/packages/vsphere-plugin/src/components/utils.ts b/frontend/packages/vsphere-plugin/src/components/utils.ts
@@ -27,7 +27,13 @@ export const decodeBase64 = (data: string) => Buffer.from(data, 'base64').toStri
 
 export const mergeCloudProviderConfig = (
   existingIni: string,
-  { vcenter, datacenter, defaultDatastore: defaultdatastore, folder }: ConnectionFormContextValues,
+  {
+    vcenter,
+    datacenter,
+    defaultDatastore: defaultdatastore,
+    folder,
+    vCenterCluster,
+  }: ConnectionFormContextValues,
 ): string => {
   const configIni = decode(existingIni);
 
@@ -42,6 +48,7 @@ export const mergeCloudProviderConfig = (
   configIni.Workspace.datacenter = datacenter;
   configIni.Workspace['default-datastore'] = defaultdatastore;
   configIni.Workspace.folder = folder;
+  configIni.Workspace['resourcepool-path'] = `/${datacenter}/host/${vCenterCluster}/Resources`;
 
   Object.keys(configIni).forEach((k: string) => {
     if (k.startsWith('VirtualCenter')) {