Update log request to always use datacenter in request path (#209) (#239

) (#244)

* Update log request to always use datacenter in request path

Also, fix error handling for log requests since errors come in text form

* Fix VCH log view unit tests

h5c/vic/src/vic-webapp/src/app/create-vch-wizard/create-vch-wizard.service.ts

@@ -375,4 +375,28 @@ export class CreateVchWizardService {
             .map(response => ip);
         });
     }
+
+    /**
+     * Recursively queries the H5 Client for a datacenter associated with the resource
+     * @param resourceObjRef
+     */
+    getDatacenterForResource(resourceObjRef: string) {
+      if (resourceObjRef.split(':')[2] === 'Datacenter') {
+        return this.http.get(`/ui/data/properties/${resourceObjRef}?properties=name`)
+          .catch(e => Observable.throw(e))
+          .map(response => response.json())
+      } else {
+        return this.http.get(`/ui/data/properties/${resourceObjRef}?properties=parent`)
+          .catch(e => Observable.throw(e))
+          .map(response => response.json())
+          .switchMap((response) => {
+            if (typeof response.parent === 'object') {
+              return this.getDatacenterForResource(
+                `urn:vmomi:${response.parent.type}:${response.parent.value}:${response.parent.serverGuid}`
+              );
+            }
+            return Observable.throw(`Error getting Datacenter for resource '${resourceObjRef}'`);
+          });
+      }
+    }
 }

h5c/vic/src/vic-webapp/src/app/vch-view/vch-log-view/vch-log-view.component.spec.ts

@@ -74,6 +74,11 @@ describe('VicVchLogViewComponent', () => {
             },
             acquireCloneTicket(): Observable<string> {
               return Observable.of('ticket');
+            },
+            getDatacenterForResource(): Observable<any> {
+              return Observable.of({
+                id: 'urn:vmomi:Datacenter:dc-test:00000000-0000-0000-0000-000000000000'
+              })
             }
           }
         },

h5c/vic/src/vic-webapp/src/app/vch-view/vch-log-view/vch-log-view.component.ts

@@ -50,17 +50,20 @@ export class VicVchLogViewComponent implements OnInit {
     this.loading = true;
     Observable.combineLatest(
       this.createWzService.getVicApplianceIp(),
-      this.createWzService.acquireCloneTicket()
-    ).catch(err => {
+      this.createWzService.acquireCloneTicket(),
+      this.createWzService.getDatacenterForResource(this.vch.id)
+  ).catch(err => {
       return Observable.throw(err);
-    }).subscribe(([serviceHost, cloneTicket]) => {
+    }).subscribe(([serviceHost, cloneTicket, datacenter]) => {
       const vchId = this.vch.id.split(':')[3];
       const servicePort = VIC_APPLIANCE_PORT;
       const targetHost = this.extSessionService.getVcenterServersInfo()[0];
       const targetHostname = targetHost.name;
       const targetThumbprint = targetHost.thumbprint;
+      const targetDatacenter = datacenter.id.split(':')[3];
       const url =
-        `https://${serviceHost}:${servicePort}/container/target/${targetHostname}/vch/${vchId}/log?thumbprint=${targetThumbprint}`;
+        `https://${serviceHost}:${servicePort}/container/target/${targetHostname}/datacenter/${targetDatacenter}` +
+        `/vch/${vchId}/log?thumbprint=${targetThumbprint}`;
 
       const headers  = new Headers({
         'Content-Type': 'application/json',
@@ -69,13 +72,11 @@ export class VicVchLogViewComponent implements OnInit {
 
       const options  = new RequestOptions({ headers: headers });
       this.http.get(url, options)
+        .catch(error => Observable.of(error))
         .map(response => response.text())
         .subscribe(response => {
           this.log = response;
           this.loading = false;
-        }, error => {
-          this.log = error.message || 'Error loading VCH log!';
-          this.loading = false;
         });
     });
   }