Merge "Accommodate WAN Networking"

3 files changed, 68 insertions, 5 deletions

diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
index bd5f0d0dbc..6d1c97eba3 100644
--- a/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
@@ -703,8 +703,7 @@ public class ToscaResourceInstaller {
                 toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(nodeTemplate, "role"));
         configCustomizationResource.setType(
                 toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(nodeTemplate, "type"));
-        configCustomizationResource
-                .setServiceProxyResourceCustomizationUUID(spResourceCustomization.getModelCustomizationUUID());
+        configCustomizationResource.setServiceProxyResourceCustomization(spResourceCustomization);
 
         configCustomizationResource.setConfigurationResource(configResource);
         configCustomizationResource.setService(service);
@@ -1356,6 +1355,13 @@ public class ToscaResourceInstaller {
 
             service.setModelInvariantUUID(serviceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID));
             service.setCsar(toscaResourceStructure.getCatalogToscaCsar());
+            service.setNamingPolicy(serviceMetadata.getValue("namingPolicy"));
+            String generateNaming = serviceMetadata.getValue("ecompGeneratedNaming");
+            Boolean generateNamingValue = null;
+            if (generateNaming != null) {
+                generateNamingValue = "true".equalsIgnoreCase(generateNaming);
+            }
+            service.setOnapGeneratedNaming(generateNamingValue);
         }
 
 
diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/installer/heat/ToscaResourceInstallerTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/installer/heat/ToscaResourceInstallerTest.java
index dd107f7775..bd8e877369 100644
--- a/asdc-controller/src/test/java/org/onap/so/asdc/installer/heat/ToscaResourceInstallerTest.java
+++ b/asdc-controller/src/test/java/org/onap/so/asdc/installer/heat/ToscaResourceInstallerTest.java
@@ -34,6 +34,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import org.hibernate.exception.LockAcquisitionException;
 import org.junit.Before;
 import org.junit.Rule;
@@ -42,6 +43,7 @@ import org.junit.rules.ExpectedException;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.INotificationData;
 import org.onap.sdc.api.notification.IResourceInstance;
 import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
 import org.onap.sdc.tosca.parser.impl.SdcCsarHelperImpl;
@@ -56,6 +58,7 @@ import org.onap.so.asdc.client.exceptions.ArtifactInstallerException;
 import org.onap.so.asdc.client.test.emulators.ArtifactInfoImpl;
 import org.onap.so.asdc.client.test.emulators.JsonStatusData;
 import org.onap.so.asdc.client.test.emulators.NotificationDataImpl;
+import org.onap.so.asdc.installer.ResourceStructure;
 import org.onap.so.asdc.installer.ToscaResourceStructure;
 import org.onap.so.db.catalog.beans.ConfigurationResource;
 import org.onap.so.db.catalog.beans.ConfigurationResourceCustomization;
@@ -340,7 +343,59 @@ public class ToscaResourceInstallerTest extends BaseTest {
         return actualWatchdogComponentDistributionStatus;
     }
 
-
+    @Test
+    public void createServiceTest() {
+        ToscaResourceStructure toscaResourceStructure = mock(ToscaResourceStructure.class);
+        ResourceStructure resourceStructure = mock(ResourceStructure.class);
+        Metadata metadata = mock(Metadata.class);
+        INotificationData notification = mock(INotificationData.class);
+
+        doReturn("e2899e5c-ae35-434c-bada-0fabb7c1b44d").when(toscaResourceStructure).getServiceVersion();
+        doReturn(metadata).when(toscaResourceStructure).getServiceMetadata();
+        doReturn("production").when(notification).getWorkloadContext();
+        doReturn(notification).when(resourceStructure).getNotification();
+
+        String serviceType = "test-type";
+        String serviceRole = "test-role";
+        String category = "Network L4+";
+        String description = "Customer Orderable service description";
+        String name = "Customer Orderable Service";
+        String uuid = "72db5868-4575-4804-b546-0b0d3c3b5ac6";
+        String invariantUUID = "6f30bbe3-4590-4185-a7e0-4f9610926c6f";
+        String namingPolicy = "naming Policy";
+        String ecompGeneratedNaming = "true";
+        String environmentContext = "General_Revenue-Bearing";
+
+        doReturn(serviceType).when(metadata).getValue("serviceType");
+        doReturn(serviceRole).when(metadata).getValue("serviceRole");
+
+        doReturn(category).when(metadata).getValue(SdcPropertyNames.PROPERTY_NAME_CATEGORY);
+        doReturn(description).when(metadata).getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION);
+
+        doReturn(name).when(metadata).getValue(SdcPropertyNames.PROPERTY_NAME_NAME);
+
+        doReturn(uuid).when(metadata).getValue(SdcPropertyNames.PROPERTY_NAME_UUID);
+
+        doReturn(environmentContext).when(metadata).getValue(metadata.getValue("environmentContext"));
+        doReturn(invariantUUID).when(metadata).getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID);
+        doReturn(namingPolicy).when(metadata).getValue("namingPolicy");
+        doReturn(ecompGeneratedNaming).when(metadata).getValue("ecompGeneratedNaming");
+
+        Service service = toscaInstaller.createService(toscaResourceStructure, resourceStructure);
+
+        assertNotNull(service);
+
+        verify(toscaResourceStructure, times(2)).getServiceVersion();
+        assertNotNull(service.getNamingPolicy());
+        assertEquals(serviceType, service.getServiceType());
+        assertEquals(serviceRole, service.getServiceRole());
+        assertEquals(category, service.getCategory());
+        assertEquals(description, service.getDescription());
+        assertEquals(uuid, service.getModelUUID());
+        assertEquals(invariantUUID, service.getModelInvariantUUID());
+        assertEquals(namingPolicy, service.getNamingPolicy());
+        assertTrue(service.getOnapGeneratedNaming());
+    }
 
     private void prepareConfigurationResource() {
         doReturn(metadata).when(nodeTemplate).getMetaData();
@@ -396,7 +451,7 @@ public class ToscaResourceInstallerTest extends BaseTest {
         assertNotNull(configurationResourceCustomization);
         assertNotNull(configurationResourceCustomization.getConfigurationResource());
         assertEquals(MockConstants.MODEL_CUSTOMIZATIONUUID,
-                configurationResourceCustomization.getServiceProxyResourceCustomizationUUID());
+                configurationResourceCustomization.getServiceProxyResourceCustomization().getModelCustomizationUUID());
     }
 
     @Test
diff --git a/asdc-controller/src/test/resources/schema.sql b/asdc-controller/src/test/resources/schema.sql
index 0e8024da0a..5e4af83e0e 100644
--- a/asdc-controller/src/test/resources/schema.sql
+++ b/asdc-controller/src/test/resources/schema.sql
@@ -806,7 +806,9 @@ CREATE TABLE `service` (
   `WORKLOAD_CONTEXT` varchar(200) DEFAULT NULL,
   `SERVICE_CATEGORY` varchar(200) DEFAULT NULL,
   `RESOURCE_ORDER` varchar(200) default NULL,
-   OVERALL_DISTRIBUTION_STATUS varchar(45),
+  `OVERALL_DISTRIBUTION_STATUS` varchar(45),
+  `ONAP_GENERATED_NAMING` TINYINT(1) DEFAULT NULL,
+  `NAMING_POLICY` varchar(200) DEFAULT NULL,
   PRIMARY KEY (`MODEL_UUID`),
   KEY `fk_service__tosca_csar1_idx` (`TOSCA_CSAR_ARTIFACT_UUID`),
   CONSTRAINT `fk_service__tosca_csar1` FOREIGN KEY (`TOSCA_CSAR_ARTIFACT_UUID`) REFERENCES `tosca_csar` (`ARTIFACT_UUID`) ON DELETE CASCADE ON UPDATE CASCADE