Adding endpoints to SDC simulator

for ETSI NFVO NS LCM Usecase

Change-Id: I1a626dce2a24364a81076e4a860a9b658edf2d59
Issue-ID: INT-1839
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>

2 files changed, 83 insertions, 30 deletions

diff --git a/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/controller/CatalogControllerTest.java b/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/controller/CatalogControllerTest.java
index e63a7f90..d7ae74bb 100644
--- a/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/controller/CatalogControllerTest.java
+++ b/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/controller/CatalogControllerTest.java
@@ -23,13 +23,13 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import java.util.Base64;
-import java.util.Optional;
 import java.util.Set;
+import java.util.UUID;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.onap.so.sdcsimulator.models.ResourceArtifact;
-import org.onap.so.sdcsimulator.providers.ResourceProvider;
+import org.onap.so.sdcsimulator.models.Metadata;
+import org.onap.so.sdcsimulator.models.ResourceAssetInfo;
+import org.onap.so.sdcsimulator.models.ServiceAssetInfo;
 import org.onap.so.sdcsimulator.utils.Constants;
 import org.onap.so.simulator.model.UserCredentials;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +58,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 @Configuration
 public class CatalogControllerTest {
 
+    private static final String SERVICE_ID = "9bb8c882-44a1-4b67-a12c-5a998e18d6ba";
+
+    private static final String RESOURCE_ID = "73522444-e8e9-49c1-be29-d355800aa349";
+
     private static final String PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U";
 
     @LocalServerPort
@@ -72,42 +76,90 @@ public class CatalogControllerTest {
     @Test
     public void test_getCsar_validCsarId_matchContent() {
 
-        final String url = getBaseUrl() + "/resources/" + Constants.DEFAULT_CSAR_NAME + "/toscaModel";
+        final String url = getBaseUrl() + "/resources/" + RESOURCE_ID + "/toscaModel";
 
         final ResponseEntity<byte[]> response =
                 restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(getHttpHeaders()), byte[].class);
 
         assertEquals(HttpStatus.OK, response.getStatusCode());
         assertTrue(response.hasBody());
-        assertEquals(3982, response.getBody().length);
+        assertEquals(117247, response.getBody().length);
 
     }
 
     @Test
     public void test_getResources_validResourcesFromClassPath() {
 
-        final ResponseEntity<Set<ResourceArtifact>> response =
+        final ResponseEntity<Set<ResourceAssetInfo>> response =
                 restTemplate.exchange(getBaseUrl() + "/resources", HttpMethod.GET, new HttpEntity<>(getHttpHeaders()),
-                        new ParameterizedTypeReference<Set<ResourceArtifact>>() {});
+                        new ParameterizedTypeReference<Set<ResourceAssetInfo>>() {});
 
         assertEquals(HttpStatus.OK, response.getStatusCode());
         assertTrue(response.hasBody());
-        assertEquals(3, response.getBody().size());
+        assertEquals(1, response.getBody().size());
 
     }
 
     @Test
-    public void test_getCsar_invalidCsar_internalServerError() {
-        final ResourceProvider mockedResourceProvider = Mockito.mock(ResourceProvider.class);
-        Mockito.when(mockedResourceProvider.getResource(Mockito.anyString())).thenReturn(Optional.empty());
-        final CatalogController objUnderTest = new CatalogController(mockedResourceProvider);
+    public void test_getServices_validServicesFromClassPath() {
+
+        final ResponseEntity<Set<ServiceAssetInfo>> response =
+                restTemplate.exchange(getBaseUrl() + "/services", HttpMethod.GET, new HttpEntity<>(getHttpHeaders()),
+                        new ParameterizedTypeReference<Set<ServiceAssetInfo>>() {});
+
+        assertEquals(HttpStatus.OK, response.getStatusCode());
+        assertTrue(response.hasBody());
+        assertEquals(1, response.getBody().size());
+
+    }
+
+    @Test
+    public void test_getResourceCsar_invalidCsar_internalServerError() {
+        final String url = getBaseUrl() + "/resources/" + UUID.randomUUID().toString() + "/toscaModel";
+
+        final ResponseEntity<byte[]> response =
+                restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(getHttpHeaders()), byte[].class);
 
-        final ResponseEntity<byte[]> response = objUnderTest.getCsar(Constants.DEFAULT_CSAR_NAME);
 
         assertFalse(response.hasBody());
         assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
     }
 
+    @Test
+    public void test_getResourceMetadata_validMetadataFileInClasspath_matchContent() {
+
+        final String url = getBaseUrl() + "/resources/" + RESOURCE_ID + "/metadata";
+
+        final ResponseEntity<Metadata> response =
+                restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(getHttpHeaders()), Metadata.class);
+
+
+        assertEquals(HttpStatus.OK, response.getStatusCode());
+        assertTrue(response.hasBody());
+        final Metadata actual = response.getBody();
+        assertEquals(8, actual.getResources().size());
+        assertEquals(3, actual.getArtifacts().size());
+
+    }
+
+    @Test
+    public void test_getServiceMetadata_validMetadataFileInClasspath_matchContent() {
+
+        final String url = getBaseUrl() + "/services/" + SERVICE_ID + "/metadata";
+
+        final ResponseEntity<Metadata> response =
+                restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(getHttpHeaders()), Metadata.class);
+
+
+        assertEquals(HttpStatus.OK, response.getStatusCode());
+        assertTrue(response.hasBody());
+        final Metadata actual = response.getBody();
+        assertEquals(1, actual.getResources().size());
+        assertEquals(1, actual.getArtifacts().size());
+
+    }
+
+
     private String getBaseUrl() {
         return "http://localhost:" + port + Constants.CATALOG_URL;
     }
diff --git a/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/providers/ResourceProviderImplTest.java b/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/providers/AssetProviderImplTest.java
index c132184c..293d70d2 100644
--- a/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/providers/ResourceProviderImplTest.java
+++ b/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/providers/AssetProviderImplTest.java
@@ -22,6 +22,10 @@ package org.onap.so.sdcsimulator.providers;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertFalse;
+import static org.onap.so.sdcsimulator.models.AssetType.RESOURCES;
+import static org.onap.so.sdcsimulator.utils.Constants.DOT_CSAR;
+import static org.onap.so.sdcsimulator.utils.Constants.FORWARD_SLASH;
+import static org.onap.so.sdcsimulator.utils.Constants.MAIN_RESOURCE_FOLDER;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -30,7 +34,6 @@ import java.util.UUID;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.onap.so.sdcsimulator.utils.Constants;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.util.StreamUtils;
@@ -39,7 +42,9 @@ import org.springframework.util.StreamUtils;
  * @author Waqas Ikram (waqas.ikram@est.tech)
  * @author Eoin Hanan (eoin.hanan@est.tech)
  */
-public class ResourceProviderImplTest {
+public class AssetProviderImplTest {
+
+    private static final String VNF_RESOURCE_ID = "73522444-e8e9-49c1-be29-d355800aa349";
 
     @Rule
     public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -51,38 +56,34 @@ public class ResourceProviderImplTest {
 
     @Test
     public void test_getResource_withValidPath_matchContent() throws IOException {
-        final File folder = temporaryFolder.newFolder();
+        final File folder = temporaryFolder.newFolder(RESOURCES.toString());
         final String uuid = UUID.randomUUID().toString();
-        final Path file = Files.createFile(folder.toPath().resolve(uuid + Constants.DOT_CSAR));
+        final Path file = Files.createFile(folder.toPath().resolve(uuid + DOT_CSAR));
 
         Files.write(file, DUMMY_CONTENT.getBytes());
 
-        final ResourceProviderImpl objUnderTest = new ResourceProviderImpl(folder.getPath(), resourcePatternResolver);
+        final AssetProviderImpl objUnderTest = new AssetProviderImpl(folder.getPath(), resourcePatternResolver);
 
-        assertArrayEquals(DUMMY_CONTENT.getBytes(), objUnderTest.getResource(uuid).get());
+        assertArrayEquals(DUMMY_CONTENT.getBytes(), objUnderTest.getAsset(uuid, RESOURCES).get());
     }
 
     @Test
     public void test_getResource_withoutValidPath_matchContent() throws IOException {
-        final ClassPathResource classPathResource = new ClassPathResource(Constants.DEFAULT_CSAR_PATH, this.getClass());
+        final String validCsarPath = MAIN_RESOURCE_FOLDER + RESOURCES + FORWARD_SLASH + VNF_RESOURCE_ID + DOT_CSAR;
+        final ClassPathResource classPathResource = new ClassPathResource(validCsarPath, this.getClass());
 
         final byte[] expectedResult = StreamUtils.copyToByteArray(classPathResource.getInputStream());
 
-        final ResourceProviderImpl objUnderTest = new ResourceProviderImpl("", resourcePatternResolver);
+        final AssetProviderImpl objUnderTest = new AssetProviderImpl("", resourcePatternResolver);
 
-        assertArrayEquals(expectedResult, objUnderTest.getResource(Constants.DEFAULT_CSAR_NAME).get());
+        assertArrayEquals(expectedResult, objUnderTest.getAsset(VNF_RESOURCE_ID, RESOURCES).get());
     }
 
     @Test
     public void test_getResource_unbleToReadFileFromClasspath_emptyOptional() throws IOException {
 
-        final ResourceProviderImpl objUnderTest = new ResourceProviderImpl("", resourcePatternResolver) {
-            @Override
-            String getDefaultCsarPath() {
-                return "/some/dummy/path";
-            }
-        };
-        assertFalse(objUnderTest.getResource(UUID.randomUUID().toString()).isPresent());
+        final AssetProviderImpl objUnderTest = new AssetProviderImpl("", resourcePatternResolver);
+        assertFalse(objUnderTest.getAsset(UUID.randomUUID().toString(), RESOURCES).isPresent());
 
     }
 }