[ep-ext] support for custom compute profiles UI

Testing Done: junit, manual Change-Id: I9fd661364abce339b69b1444b5aebf258c407177 Reviewed-on: http://bellevue-ci.eng.vmware.com:8080/12928 Compute-Verified: jenkins <[email protected]> Reviewed-by: George P Dimitrov <[email protected]> Upgrade-Verified: jenkins <[email protected]> Closures-Verified: jenkins <[email protected]> Bellevue-Verified: jenkins <[email protected]> CS-Verified: jenkins <[email protected]>
shism2 · Jul 7, 2017 · 146ffeb · 146ffeb
1 parent aae024b
commit 146ffeb
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/...c/main/java/com/vmware/admiral/adapter/extensibility/service/FetchDataGatewayService.java b/...c/main/java/com/vmware/admiral/adapter/extensibility/service/FetchDataGatewayService.java
@@ -107,10 +107,15 @@ private DeferredResult<String> getEndpointType(FetchDataRequest fetchDataRequest
         case EndpointType: {
             return DeferredResult.completed(fetchDataRequest.entityId);
         }
+        case Endpoint: {
+            String entityId = fetchDataRequest.entityId;
+            AssertUtil.assertNotNull(entityId, "'fetchDataRequest.entityId' must be set.");
+            return getEndpointType(entityId);
+        }
         case ResourceDetails:
         case ResourceOperation: {
             String entityId = fetchDataRequest.entityId;
-            AssertUtil.assertNotNull(entityId, "'entityId.requestType' must be set.");
+            AssertUtil.assertNotNull(entityId, "'fetchDataRequest.entityId' must be set.");
             return sendWithDeferredResult(Operation.createGet(this, entityId),
                     EndpointLinkAware.class)
                     .thenCompose(epla -> getEndpointType(epla.endpointLink));

diff --git a/...st/java/com/vmware/admiral/adapter/extensibility/service/FetchDataGatewayServiceTest.java b/...st/java/com/vmware/admiral/adapter/extensibility/service/FetchDataGatewayServiceTest.java
@@ -113,6 +113,19 @@ public void testGetByResource() {
                 });
     }
 
+    @Test
+    public void testGetByEndpoint() {
+        testGetByXXX(false, false,
+                (ept, d) -> {
+                    EndpointState endpointState = registerEndpoint(ept);
+                    FetchDataRequest request = new FetchDataRequest();
+                    request.entityId = endpointState.documentSelfLink;
+                    request.requestType = RequestType.Endpoint;
+                    request.data = d;
+                    return request;
+                });
+    }
+
     private void testGetByXXX(boolean withHost, boolean withWrongPath,
             BiFunction<String, Object, FetchDataRequest> config) {
 

diff --git a/ui/app/src/js/components/profiles/ProfileEditView.js b/ui/app/src/js/components/profiles/ProfileEditView.js
@@ -247,7 +247,7 @@ export default Vue.component('profile-edit-view', {
         function(url, body) {
           return {
             requestType: 'Endpoint',
-            entityId: _this.endpoint,
+            entityId: _this.endpoint.documentSelfLink,
             data: body
           };
         });