Adding service instances endpoint supports

Change-Id: I778d750fe68a88b10eacb9b447a2a96e670b181c
Issue-ID: SO-1953
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>

2 files changed, 229 insertions, 17 deletions

diff --git a/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/java/org/onap/so/aai/simulator/controller/BusinessControllerTest.java b/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/java/org/onap/so/aai/simulator/controller/BusinessControllerTest.java
index 3d856844..d317e6b6 100644
--- a/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/java/org/onap/so/aai/simulator/controller/BusinessControllerTest.java
+++ b/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/java/org/onap/so/aai/simulator/controller/BusinessControllerTest.java
@@ -25,16 +25,22 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import java.io.File;
 import java.io.IOException;
+import java.util.Base64;
+import java.util.Optional;
+import java.util.UUID;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.aai.domain.yang.Customer;
+import org.onap.aai.domain.yang.ServiceInstance;
+import org.onap.aai.domain.yang.ServiceInstances;
 import org.onap.aai.domain.yang.ServiceSubscription;
-import org.onap.so.aai.simulator.service.providers.CustomerServiceProvider;
+import org.onap.so.aai.simulator.service.providers.CacheServiceProvider;
 import org.onap.so.aai.simulator.utils.Constant;
 import org.onap.so.aai.simulator.utils.RequestError;
 import org.onap.so.aai.simulator.utils.ServiceException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.test.web.client.TestRestTemplate;
@@ -42,6 +48,7 @@ import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -60,42 +67,61 @@ import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
 @Configuration
 public class BusinessControllerTest {
 
+    private static final String SERVICE_INSTANCES_URL = "/service-instances";
+
+    private static final String SERVICE_NAME = "ServiceTest";
+
+    private static final String SERVICE_INSTANCE_ID = "ccece8fe-13da-456a-baf6-41b3a4a2bc2b";
+
+    private static final String SERVICE_INSTANCE_URL =
+            SERVICE_INSTANCES_URL + "/service-instance/" + SERVICE_INSTANCE_ID;
+
     private static final String SERVICE_TYPE = "vCPE";
 
+    private static final String SERVICE_SUBSCRIPTIONS_URL =
+            "/service-subscriptions/service-subscription/" + SERVICE_TYPE;
+
     private static final String GLOBAL_CUSTOMER_ID = "DemoCustomer";
 
+    private static final String CUSTOMERS_URL = Constant.BUSINESS_URL + "customers/customer/" + GLOBAL_CUSTOMER_ID;
+
+    private static final String PASSWORD = "aai.onap.org:demo123456!";
+
     @LocalServerPort
     private int port;
 
     @Autowired
     private TestRestTemplate restTemplate;
 
+    @Value("${spring.security.username}")
+    private String username;
+
     @Autowired
-    private CustomerServiceProvider customerServiceProvider;
+    private CacheServiceProvider cacheServiceProvider;
 
     @After
     public void after() {
-        customerServiceProvider.clearAll();
+        cacheServiceProvider.clearAll();
     }
 
     @Test
     public void test_putCustomer_successfullyAddedToCache() throws Exception {
         final Customer customer = getCustomer(getFile("test-data/business-customer.json"));
-        final String url = getBaseUrl() + "/customers/customer/" + GLOBAL_CUSTOMER_ID;
-        final ResponseEntity<Void> actual = invokeHttpPut(url, customer);
+        final ResponseEntity<Void> actual = invokeHttpPut(getCustomerEndPointUrl(), customer);
 
         assertEquals(HttpStatus.ACCEPTED, actual.getStatusCode());
-        assertTrue(customerServiceProvider.getCustomer(GLOBAL_CUSTOMER_ID).isPresent());
+        assertTrue(cacheServiceProvider.getCustomer(GLOBAL_CUSTOMER_ID).isPresent());
     }
 
     @Test
     public void test_getCustomer_ableToRetrieveCustomer() throws Exception {
         final Customer customer = getCustomer(getFile("test-data/business-customer.json"));
-        final String url = getBaseUrl() + "/customers/customer/" + GLOBAL_CUSTOMER_ID;
+        final String url = getCustomerEndPointUrl();
 
         invokeHttpPut(url, customer);
 
-        final ResponseEntity<Customer> actual = restTemplate.getForEntity(url, Customer.class);
+        final ResponseEntity<Customer> actual =
+                restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(getHttpHeaders()), Customer.class);
 
         assertEquals(HttpStatus.OK, actual.getStatusCode());
         assertTrue(actual.hasBody());
@@ -108,9 +134,10 @@ public class BusinessControllerTest {
 
     @Test
     public void test_getCustomer_returnRequestError_ifCustomerNotInCache() throws Exception {
-        final String url = getBaseUrl() + "/customers/customer/" + GLOBAL_CUSTOMER_ID;
+        final String url = getCustomerEndPointUrl();
 
-        final ResponseEntity<RequestError> actual = restTemplate.getForEntity(url, RequestError.class);
+        final ResponseEntity<RequestError> actual =
+                restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(getHttpHeaders()), RequestError.class);
 
         assertEquals(HttpStatus.NOT_FOUND, actual.getStatusCode());
 
@@ -127,12 +154,12 @@ public class BusinessControllerTest {
     @Test
     public void test_getServiceSubscription_ableToRetrieveServiceSubscriptionFromCache() throws Exception {
         final Customer customer = getCustomer(getFile("test-data/business-customer.json"));
-        final String customerUrl = getBaseUrl() + "/customers/customer/" + GLOBAL_CUSTOMER_ID;
-        final String url = customerUrl + "/service-subscriptions/service-subscription/" + SERVICE_TYPE;
+        final String url = getCustomerEndPointUrl() + SERVICE_SUBSCRIPTIONS_URL;
 
-        invokeHttpPut(customerUrl, customer);
+        invokeHttpPut(getCustomerEndPointUrl(), customer);
 
-        final ResponseEntity<ServiceSubscription> actual = restTemplate.getForEntity(url, ServiceSubscription.class);
+        final ResponseEntity<ServiceSubscription> actual = restTemplate.exchange(url, HttpMethod.GET,
+                new HttpEntity<>(getHttpHeaders()), ServiceSubscription.class);
 
         assertEquals(HttpStatus.OK, actual.getStatusCode());
         assertTrue(actual.hasBody());
@@ -143,8 +170,176 @@ public class BusinessControllerTest {
         assertFalse(actualServiceSubscription.getRelationshipList().getRelationship().isEmpty());
     }
 
+    @Test
+    public void test_putSericeInstance_ableToRetrieveServiceInstanceFromCache() throws Exception {
+        final Customer customer = getCustomer(getFile("test-data/business-customer.json"));
+
+        final String url = getCustomerEndPointUrl() + SERVICE_SUBSCRIPTIONS_URL + SERVICE_INSTANCE_URL;
+
+        final ResponseEntity<Void> response = invokeHttpPut(getCustomerEndPointUrl(), customer);
+
+        assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
+
+        final ServiceInstance serviceInstance =
+                getObjectFromFile(getFile("test-data/service-instance.json"), ServiceInstance.class);
+
+        invokeHttpPut(url, serviceInstance);
+
+        final Optional<ServiceInstance> actual =
+                cacheServiceProvider.getServiceInstance(GLOBAL_CUSTOMER_ID, SERVICE_TYPE, SERVICE_INSTANCE_ID);
+
+        assertTrue(actual.isPresent());
+        final ServiceInstance actualServiceInstance = actual.get();
+
+        assertEquals(SERVICE_INSTANCE_ID, actualServiceInstance.getServiceInstanceId());
+        assertEquals(SERVICE_NAME, actualServiceInstance.getServiceInstanceName());
+
+    }
+
+    @Test
+    public void test_getSericeInstance_usingServiceInstanceName_ableToRetrieveServiceInstanceFromCache()
+            throws Exception {
+        final Customer customer = getCustomer(getFile("test-data/business-customer.json"));
+
+        final String url = getCustomerEndPointUrl() + SERVICE_SUBSCRIPTIONS_URL + SERVICE_INSTANCE_URL;
+
+        final ResponseEntity<Void> response = invokeHttpPut(getCustomerEndPointUrl(), customer);
+
+        assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
+
+        final ServiceInstance serviceInstance =
+                getObjectFromFile(getFile("test-data/service-instance.json"), ServiceInstance.class);
+
+        invokeHttpPut(url, serviceInstance);
+
+        final String serviceInstanceUrl = getCustomerEndPointUrl() + SERVICE_SUBSCRIPTIONS_URL + SERVICE_INSTANCES_URL
+                + "?service-instance-name=" + SERVICE_NAME;
+
+        final ResponseEntity<ServiceInstances> actual = restTemplate.exchange(serviceInstanceUrl, HttpMethod.GET,
+                new HttpEntity<>(getHttpHeaders()), ServiceInstances.class);
+
+        assertEquals(HttpStatus.OK, actual.getStatusCode());
+        assertTrue(actual.hasBody());
+
+        final ServiceInstances actualServiceInstances = actual.getBody();
+        assertFalse(actualServiceInstances.getServiceInstance().isEmpty());
+
+        assertEquals(SERVICE_NAME, actualServiceInstances.getServiceInstance().get(0).getServiceInstanceName());
+
+    }
+
+    @Test
+    public void test_getSericeInstance_usingServiceInstanceId_ableToRetrieveServiceInstanceFromCache()
+            throws Exception {
+        final Customer customer = getCustomer(getFile("test-data/business-customer.json"));
+
+        final String url = getCustomerEndPointUrl() + SERVICE_SUBSCRIPTIONS_URL + SERVICE_INSTANCE_URL;
+
+        final ResponseEntity<Void> response = invokeHttpPut(getCustomerEndPointUrl(), customer);
+
+        assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
+
+        final ServiceInstance serviceInstance =
+                getObjectFromFile(getFile("test-data/service-instance.json"), ServiceInstance.class);
+
+        invokeHttpPut(url, serviceInstance);
+
+        final ResponseEntity<ServiceInstance> actual =
+                restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(getHttpHeaders()), ServiceInstance.class);
+
+        assertEquals(HttpStatus.OK, actual.getStatusCode());
+        assertTrue(actual.hasBody());
+
+        final ServiceInstance actualServiceInstance = actual.getBody();
+
+        assertEquals(SERVICE_NAME, actualServiceInstance.getServiceInstanceName());
+        assertEquals(SERVICE_INSTANCE_ID, actualServiceInstance.getServiceInstanceId());
+
+    }
+
+    @Test
+    public void test_getSericeInstance_usinginvalidServiceInstanceId_shouldReturnError() throws Exception {
+        final Customer customer = getCustomer(getFile("test-data/business-customer.json"));
+
+        final String url = getCustomerEndPointUrl() + SERVICE_SUBSCRIPTIONS_URL + SERVICE_INSTANCE_URL;
+
+        final ResponseEntity<Void> response = invokeHttpPut(getCustomerEndPointUrl(), customer);
+
+        assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
+
+        final ServiceInstance serviceInstance =
+                getObjectFromFile(getFile("test-data/service-instance.json"), ServiceInstance.class);
+
+        invokeHttpPut(url, serviceInstance);
+
+        String invalidServiceInstanceUrl = getCustomerEndPointUrl() + SERVICE_SUBSCRIPTIONS_URL + SERVICE_INSTANCES_URL
+                + "/service-instance/" + UUID.randomUUID();
+
+        final ResponseEntity<RequestError> actual = restTemplate.exchange(invalidServiceInstanceUrl, HttpMethod.GET,
+                new HttpEntity<>(getHttpHeaders()), RequestError.class);
+
+        assertEquals(HttpStatus.NOT_FOUND, actual.getStatusCode());
+
+        final RequestError actualError = actual.getBody();
+        final ServiceException serviceException = actualError.getServiceException();
+
+        assertNotNull(serviceException);
+        assertEquals(Constant.ERROR_MESSAGE_ID, serviceException.getMessageId());
+        assertEquals(Constant.ERROR_MESSAGE, serviceException.getText());
+        assertTrue(serviceException.getVariables().contains(HttpMethod.GET.toString()));
+
+    }
+
+    @Test
+    public void test_getSericeInstance_usinginvalidServiceInstanceName_shouldReturnError() throws Exception {
+        final Customer customer = getCustomer(getFile("test-data/business-customer.json"));
+
+        final String url = getCustomerEndPointUrl() + SERVICE_SUBSCRIPTIONS_URL + SERVICE_INSTANCE_URL;
+
+        final ResponseEntity<Void> response = invokeHttpPut(getCustomerEndPointUrl(), customer);
+
+        assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
+
+        final ServiceInstance serviceInstance =
+                getObjectFromFile(getFile("test-data/service-instance.json"), ServiceInstance.class);
+
+        invokeHttpPut(url, serviceInstance);
+
+        final String serviceInstanceUrl = getCustomerEndPointUrl() + SERVICE_SUBSCRIPTIONS_URL + SERVICE_INSTANCES_URL
+                + "?service-instance-name=Dummy&depth=2";
+
+        final ResponseEntity<RequestError> actual = restTemplate.exchange(serviceInstanceUrl, HttpMethod.GET,
+                new HttpEntity<>(getHttpHeaders()), RequestError.class);
+
+        assertEquals(HttpStatus.NOT_FOUND, actual.getStatusCode());
+
+        final RequestError actualError = actual.getBody();
+        final ServiceException serviceException = actualError.getServiceException();
+
+        assertNotNull(serviceException);
+        assertEquals(Constant.ERROR_MESSAGE_ID, serviceException.getMessageId());
+        assertEquals(Constant.ERROR_MESSAGE, serviceException.getText());
+        assertTrue(serviceException.getVariables().contains(HttpMethod.GET.toString()));
+
+    }
+
+    private String getCustomerEndPointUrl() {
+        return getBaseUrl() + CUSTOMERS_URL;
+    }
+
     private ResponseEntity<Void> invokeHttpPut(final String url, final Object obj) {
-        return restTemplate.exchange(url, HttpMethod.PUT, new HttpEntity<>(obj), Void.class);
+        final HttpEntity<?> httpEntity = getHttpEntity(obj);
+        return restTemplate.exchange(url, HttpMethod.PUT, httpEntity, Void.class);
+    }
+
+    private HttpEntity<?> getHttpEntity(final Object obj) {
+        return new HttpEntity<>(obj, getHttpHeaders());
+    }
+
+    private HttpHeaders getHttpHeaders() {
+        final HttpHeaders requestHeaders = new HttpHeaders();
+        requestHeaders.add("Authorization", getBasicAuth());
+        return requestHeaders;
     }
 
     private File getFile(final String file) throws IOException {
@@ -152,14 +347,22 @@ public class BusinessControllerTest {
     }
 
     private Customer getCustomer(final File file) throws Exception {
+        return getObjectFromFile(file, Customer.class);
+    }
+
+    private <T> T getObjectFromFile(final File file, final Class<T> clazz) throws Exception {
         final ObjectMapper mapper = new ObjectMapper();
         mapper.registerModule(new JaxbAnnotationModule());
 
-        return mapper.readValue(file, Customer.class);
+        return mapper.readValue(file, clazz);
+    }
+
+    private String getBasicAuth() {
+        return "Basic " + new String(Base64.getEncoder().encodeToString((username + ":" + PASSWORD).getBytes()));
     }
 
     private String getBaseUrl() {
-        return "http://localhost:" + port + Constant.BUSINESS_URL;
+        return "http://localhost:" + port;
     }
 
 }
diff --git a/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/resources/test-data/service-instance.json b/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/resources/test-data/service-instance.json
new file mode 100644
index 00000000..18ae8cb6
--- /dev/null
+++ b/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/resources/test-data/service-instance.json
@@ -0,0 +1,9 @@
+{
+    "service-instance-id": "ccece8fe-13da-456a-baf6-41b3a4a2bc2b",
+    "service-instance-name": "ServiceTest",
+    "environment-context": "General_Revenue-Bearing",
+    "workload-context": "Production",
+    "model-invariant-id": "e9acd081-9c89-4b4d-bcb3-e0e2b9715b2a",
+    "model-version-id": "c112a499-6148-488b-ba82-3f5938cf26d2",
+    "orchestration-status": "Inventoried"
+}