Fix issue with networks population when host name contains some extra…

… text This commit will fix an error produced when hosts contains some extra text on the name added by the vc like '(reboot required)'
vmware · Apr 19, 2018 · 1d45afc · 1d45afc
1 parent 1a25d44
commit 1d45afc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/...c/src/vic-webapp/src/app/create-vch-wizard/compute-capacity/compute-capacity.component.ts b/...c/src/vic-webapp/src/app/create-vch-wizard/compute-capacity/compute-capacity.component.ts
@@ -156,16 +156,15 @@ export class ComputeCapacityComponent implements OnInit {
     let resourceObjForResourceAllocations = resourceObj;
 
     if (isCluster) {
-      computeResource = `${computeResource}/${payload.obj.text}`;
+      computeResource = `${computeResource}/${payload.obj.realName}`;
       resourceObjForResourceAllocations = payload.obj.aliases[0];
     } else {
       computeResource = payload.parentClusterObj ?
-        `${computeResource}/${payload.parentClusterObj.text}/${payload.obj.text}` :
-        `${computeResource}/${payload.obj.text}`;
+        `${computeResource}/${payload.parentClusterObj.text}/${payload.obj.realName}` :
+        `${computeResource}/${payload.obj.realName}`;
     }
-
     this.selectedResourceObjRef = resourceObj;
-    this.selectedObjectName = payload.obj.text;
+    this.selectedObjectName = payload.obj.realName;
     this._selectedComputeResource = computeResource;
 
     // set active class on the treenodecomponent whose datacenter object reference is

diff --git a/h5c/vic/src/vic-webapp/src/app/create-vch-wizard/create-vch-wizard.service.ts b/h5c/vic/src/vic-webapp/src/app/create-vch-wizard/create-vch-wizard.service.ts
@@ -139,10 +139,20 @@ export class CreateVchWizardService {
                                     `&objRef=${v.objRef}` +
                                     '&treeId=DcHostsAndClustersTree')
                                     .catch(e => Observable.throw(e))
-                                    .map(response => {
-                                      const rsp = response.json();
-                                      rsp.forEach((cluster, i) => rsp[i]['datacenterObjRef'] = v.objRef);
-                                      return rsp;
+                                    .switchMap(response => {
+                                       const computeResources: ComputeResource[] = response.json();
+                                       return Observable.from(computeResources)
+                                         .mergeMap((cr: ComputeResource) => {
+                                           cr['datacenterObjRef'] = v.objRef;
+                                           return this.http.get(`/ui/data/properties/${cr.objRef}?properties=name`)
+                                             .catch(e => Observable.throw(e))
+                                             .map(resourceName => {
+                                               const rsp = resourceName.json();
+                                               cr['realName'] = rsp['name'];
+                                               return cr;
+                                             });
+                                         })
+                                         .toArray();
                                     })
                                     .catch(e => Observable.throw(e));
                      });

diff --git a/h5c/vic/src/vic-webapp/src/app/interfaces/compute.resource.ts b/h5c/vic/src/vic-webapp/src/app/interfaces/compute.resource.ts
@@ -20,4 +20,5 @@ export interface ComputeResource {
   objRef: string;
   aliases: string[];
   isEmpty: boolean;
+  realName?: string;
 }