fix datacenter can not show host (#603)

Signed-off-by: Meina Zhou <[email protected]>
vmware · Sep 13, 2018 · 528208b · 528208b
1 parent 369c35e
commit 528208b
Showing 1 changed file with 12 additions and 2 deletions.
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
@@ -232,8 +232,18 @@ export class CreateVchWizardService {
      */
     getDcClustersAndStandAloneHosts(dcObj: ComputeResource): Observable<ComputeResource[]> {
       const props = 'host,cluster';
-      return this.getResourceProperties<{host: ResourceBasicInfo[]; cluster: ResourceBasicInfo[]}>(dcObj.objRef, props)
-        .map(data => ({childResources: data['cluster'].concat(data['host'])}))
+      return this.getResourceProperties<{ host: ResourceBasicInfo[]; cluster: ResourceBasicInfo[] }>(dcObj.objRef, props)
+        .map(data => {
+          if (data['cluster']) {
+            return {
+              childResources: data['cluster'].concat(data['host'])
+            }
+          } else {
+            return {
+              childResources: data['host']
+            }
+          }
+        })
         .switchMap(basicData => {
           return this.getResourcesCompleteInfo(basicData.childResources)
             .switchMap((completeData: ComputeResource[]) => {