Translate Enricher Attribute Names to POMBA names

Issue-ID: SDNC-317
Change-Id: I01deaa08fd645b81c971adc8b1230e1be744f50a
Signed-off-by: Phillip Leigh <phillip.leigh@amdocs.com>

1 files changed, 45 insertions, 51 deletions

diff --git a/pomba/network-discovery/src/test/java/org/onap/sdnc/apps/pomba/networkdiscovery/unittest/service/NetworkDiscoveryTest.java b/pomba/network-discovery/src/test/java/org/onap/sdnc/apps/pomba/networkdiscovery/unittest/service/NetworkDiscoveryTest.java
index 93a1304..939fc5c 100644
--- a/pomba/network-discovery/src/test/java/org/onap/sdnc/apps/pomba/networkdiscovery/unittest/service/NetworkDiscoveryTest.java
+++ b/pomba/network-discovery/src/test/java/org/onap/sdnc/apps/pomba/networkdiscovery/unittest/service/NetworkDiscoveryTest.java
@@ -73,12 +73,9 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class })
 @WebAppConfiguration
 @SpringBootTest
-@TestPropertySource(properties = {
-        "enricher.url=http://localhost:9505",
+@TestPropertySource(properties = { "enricher.url=http://localhost:9505",
         "basicAuth.username=admin",
-        "basicAuth.password=OBF:1u2a1toa1w8v1tok1u30"
-})
-
+        "basicAuth.password=OBF:1u2a1toa1w8v1tok1u30" })
 public class NetworkDiscoveryTest {
     private static final String V1 = "v1";
     private static final String APP = "junit";
@@ -121,7 +118,7 @@ public class NetworkDiscoveryTest {
         // no Authorization header
         List<String> resourceIds = Arrays.asList(UUID.randomUUID().toString());
         Response response = this.service.findbyResourceIdAndType(this.httpRequest, V1, null, APP, this.transactionId,
-                this.requestId, RESOURCE_TYPE_VSERVER, resourceIds, getCallbackUrl());
+                        this.requestId, RESOURCE_TYPE_VSERVER, resourceIds, getCallbackUrl());
         assertEquals(Status.UNAUTHORIZED.getStatusCode(), response.getStatus());
         // should get WWW-Authenticate header in response
         assertTrue(response.getHeaderString(HttpHeaders.WWW_AUTHENTICATE).startsWith("Basic realm"));
@@ -132,8 +129,8 @@ public class NetworkDiscoveryTest {
         String authorization = "Basic " + Base64.getEncoder().encodeToString("aaa:bbb".getBytes());
         // bad Authorization header
         List<String> resourceIds = Arrays.asList(UUID.randomUUID().toString());
-        Response response = this.service.findbyResourceIdAndType(this.httpRequest, V1, authorization, APP, this.transactionId,
-                this.requestId, RESOURCE_TYPE_VSERVER, resourceIds, getCallbackUrl());
+        Response response = this.service.findbyResourceIdAndType(this.httpRequest, V1, authorization, APP,
+                        this.transactionId, this.requestId, RESOURCE_TYPE_VSERVER, resourceIds, getCallbackUrl());
         assertEquals(Status.UNAUTHORIZED.getStatusCode(), response.getStatus());
         // should not get WWW-Authenticate header in response
         assertNull(response.getHeaderString(HttpHeaders.WWW_AUTHENTICATE));
@@ -144,9 +141,9 @@ public class NetworkDiscoveryTest {
         // no X-FromAppId header
         List<String> resourceIds = Arrays.asList(UUID.randomUUID().toString());
         Response response = this.service.findbyResourceIdAndType(this.httpRequest, V1, AUTH, null, this.transactionId,
-                this.requestId, RESOURCE_TYPE_VSERVER, resourceIds, getCallbackUrl());
+                        this.requestId, RESOURCE_TYPE_VSERVER, resourceIds, getCallbackUrl());
         assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus());
-        assertTrue(((String)response.getEntity()).contains(ONAPLogConstants.Headers.PARTNER_NAME));
+        assertTrue(((String) response.getEntity()).contains(ONAPLogConstants.Headers.PARTNER_NAME));
     }
 
     @Test
@@ -154,9 +151,9 @@ public class NetworkDiscoveryTest {
         // no X-FromAppId header
         List<String> resourceIds = Arrays.asList(UUID.randomUUID().toString());
         Response response = this.service.findbyResourceIdAndType(this.httpRequest, V1, AUTH, APP, this.transactionId,
-                null, RESOURCE_TYPE_VSERVER, resourceIds, getCallbackUrl());
+                        null, RESOURCE_TYPE_VSERVER, resourceIds, getCallbackUrl());
         assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus());
-        assertTrue(((String)response.getEntity()).contains("requestId"));
+        assertTrue(((String) response.getEntity()).contains("requestId"));
     }
 
     @Test
@@ -164,9 +161,9 @@ public class NetworkDiscoveryTest {
         // no X-FromAppId header
         List<String> resourceIds = Arrays.asList(UUID.randomUUID().toString());
         Response response = this.service.findbyResourceIdAndType(this.httpRequest, V1, AUTH, APP, this.transactionId,
-                this.requestId, RESOURCE_TYPE_VSERVER, resourceIds, null);
+                        this.requestId, RESOURCE_TYPE_VSERVER, resourceIds, null);
         assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus());
-        assertTrue(((String)response.getEntity()).contains("notificationURL"));
+        assertTrue(((String) response.getEntity()).contains("notificationURL"));
     }
 
     @Test
@@ -174,19 +171,19 @@ public class NetworkDiscoveryTest {
         // no resourceIds list
         {
             List<String> resourceIds = null;
-            Response response = this.service.findbyResourceIdAndType(this.httpRequest, V1, AUTH, APP, this.transactionId,
-                    this.requestId, RESOURCE_TYPE_VSERVER, resourceIds, getCallbackUrl());
+            Response response = this.service.findbyResourceIdAndType(this.httpRequest, V1, AUTH, APP,
+                            this.transactionId, this.requestId, RESOURCE_TYPE_VSERVER, resourceIds, getCallbackUrl());
             assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus());
-            assertTrue(((String)response.getEntity()).contains("resourceIds"));
+            assertTrue(((String) response.getEntity()).contains("resourceIds"));
         }
 
         // empty resourceId list
         {
             List<String> resourceIds = new ArrayList<>();
-            Response response = this.service.findbyResourceIdAndType(this.httpRequest, V1, AUTH, APP, this.transactionId,
-                    this.requestId, RESOURCE_TYPE_VSERVER, resourceIds, getCallbackUrl());
+            Response response = this.service.findbyResourceIdAndType(this.httpRequest, V1, AUTH, APP,
+                            this.transactionId, this.requestId, RESOURCE_TYPE_VSERVER, resourceIds, getCallbackUrl());
             assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus());
-            assertTrue(((String)response.getEntity()).contains("resourceIds"));
+            assertTrue(((String) response.getEntity()).contains("resourceIds"));
         }
     }
 
@@ -195,9 +192,9 @@ public class NetworkDiscoveryTest {
         // no resource type
         List<String> resourceIds = Arrays.asList(UUID.randomUUID().toString());
         Response response = this.service.findbyResourceIdAndType(this.httpRequest, V1, AUTH, APP, this.transactionId,
-                this.requestId, null, resourceIds, getCallbackUrl());
+                        this.requestId, null, resourceIds, getCallbackUrl());
         assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus());
-        assertTrue(((String)response.getEntity()).contains("resourceType"));
+        assertTrue(((String) response.getEntity()).contains("resourceType"));
     }
 
     @Test
@@ -205,29 +202,31 @@ public class NetworkDiscoveryTest {
         String vserverId = UUID.randomUUID().toString();
 
         String resourcePath = MessageFormat.format(
-                this.environment.getProperty("enricher.type.vserver.url"),
-                new Object[] { vserverId });
-
-        String enricherPayload = String.format(
-                "<vserver xmlns=\"http://org.onap.aai.inventory/v11\">\r\n"
-                + "   <vserver-id>%s</vserver-id>\r\n"
-                + "   <power-state>1</power-state>\r\n"
-                + "   <vm-state>active</vm-state>\r\n"
-                + "   <status>ACTIVE</status>\r\n"
-                + "   <host-status>UNKNOWN</host-status>\r\n"
-                + "   <updated>2017-11-20T04:26:13Z</updated>\r\n"
-                + "   <disk-allocation-gb>.010</disk-allocation-gb>\r\n"
-                + "   <memory-usage-mb>null</memory-usage-mb>\r\n"
-                + "   <cpu-util-percent>.043</cpu-util-percent>\r\n"
-                + "   <retrieval-timestamp>2018-06-27 19:41:49 +0000</retrieval-timestamp>\r\n"
-                + "</vserver>", vserverId);
+                        this.environment.getProperty("enricher.type.vserver.url"),
+                        new Object[] { vserverId });
+
+        String enricherPayload = String.format("<vserver xmlns=\"http://org.onap.aai.inventory/v11\">\r\n"
+                        + "   <vserver-id>%s</vserver-id>\r\n"
+                        + "   <power-state>1</power-state>\r\n"
+                        + "   <locked>true</locked>\r\n"
+                        + "   <hostname>10.147.112.48</hostname>\r\n"
+                        + "   <vm-state>active</vm-state>\r\n"
+                        + "   <status>ACTIVE</status>\r\n"
+                        + "   <host-status>UNKNOWN</host-status>\r\n"
+                        + "   <updated>2017-11-20T04:26:13Z</updated>\r\n"
+                        + "   <disk-allocation-gb>.010</disk-allocation-gb>\r\n"
+                        + "   <memory-usage-mb>null</memory-usage-mb>\r\n"
+                        + "   <cpu-util-percent>.043</cpu-util-percent>\r\n"
+                        + "   <retrieval-timestamp>2018-06-27 19:41:49 +0000</retrieval-timestamp>\r\n"
+                        + "</vserver>",
+                        vserverId);
 
         this.enricherRule.stubFor(get(resourcePath).willReturn(okTextXml(enricherPayload)));
 
         this.callbackRule.stubFor(post(CALLBACK_PATH).willReturn(ok("Acknowledged")));
 
         Response response = this.service.findbyResourceIdAndType(this.httpRequest, V1, AUTH, APP, null, this.requestId,
-                RESOURCE_TYPE_VSERVER, Arrays.asList(vserverId), getCallbackUrl());
+                        RESOURCE_TYPE_VSERVER, Arrays.asList(vserverId), getCallbackUrl());
 
         assertEquals(Status.OK.getStatusCode(), response.getStatus());
         NetworkDiscoveryResponse entity = (NetworkDiscoveryResponse) response.getEntity();
@@ -243,8 +242,8 @@ public class NetworkDiscoveryTest {
         ObjectMapper mapper = new ObjectMapper();
         AnnotationIntrospector introspector = new JaxbAnnotationIntrospector(TypeFactory.defaultInstance());
         mapper.setAnnotationIntrospector(introspector);
-        NetworkDiscoveryNotification notification =
-                mapper.readValue(notificationJson, NetworkDiscoveryNotification.class);
+        NetworkDiscoveryNotification notification = mapper.readValue(notificationJson,
+                        NetworkDiscoveryNotification.class);
 
         assertEquals(requestId, notification.getRequestId());
         assertEquals(Status.OK.getStatusCode(), notification.getCode().intValue());
@@ -256,15 +255,10 @@ public class NetworkDiscoveryTest {
         assertEquals("vserver", vserver.getType());
         assertEquals(DataQuality.Status.ok, vserver.getDataQuality().getStatus());
 
-        verifyAttribute(vserver.getAttributeList(), "power-state", "1");
-        verifyAttribute(vserver.getAttributeList(), "vm-state", "active");
         verifyAttribute(vserver.getAttributeList(), "status", "ACTIVE");
-        verifyAttribute(vserver.getAttributeList(), "host-status", "UNKNOWN");
-        verifyAttribute(vserver.getAttributeList(), "updated", "2017-11-20T04:26:13Z");
-        verifyAttribute(vserver.getAttributeList(), "disk-allocation-gb", ".010");
-        verifyAttribute(vserver.getAttributeList(), "memory-usage-mb", "null");
-        verifyAttribute(vserver.getAttributeList(), "cpu-util-percent", ".043");
-        verifyAttribute(vserver.getAttributeList(), "retrieval-timestamp", "2018-06-27 19:41:49 +0000");
+        verifyAttribute(vserver.getAttributeList(), "inMaintenance", "true");
+        verifyAttribute(vserver.getAttributeList(), "hostname", "10.147.112.48");
+        verifyAttribute(vserver.getAttributeList(), "vmState", "active");
     }
 
     /**
@@ -276,7 +270,7 @@ public class NetworkDiscoveryTest {
         String resourceType = "unsupported";
         List<String> resourceIds = Arrays.asList("dummyId");
         Response response = this.service.findbyResourceIdAndType(this.httpRequest, V1, AUTH, APP, this.transactionId,
-                this.requestId, resourceType, resourceIds, getCallbackUrl());
+                        this.requestId, resourceType, resourceIds, getCallbackUrl());
         assertEquals(Status.OK.getStatusCode(), response.getStatus());
 
         NetworkDiscoveryResponse entity = (NetworkDiscoveryResponse) response.getEntity();
@@ -295,7 +289,7 @@ public class NetworkDiscoveryTest {
     }
 
     private List<ServeEvent> waitForRequests(WireMockRule service, int minRequests, long timeoutSeconds)
-            throws InterruptedException {
+                    throws InterruptedException {
 
         long remaining = timeoutSeconds * 1000L;
         long retryInterval = Math.min(remaining / 5, 1000);