Merge "SO refactor - extract junit from WorkflowActionTest to ServiceEBBLoaderTest...

diff --git a/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/db/catalog/client/CatalogDbClientTest.java b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/db/catalog/client/CatalogDbClientTest.java
index c202170..8ce4051 100644 (file)
--- a/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/db/catalog/client/CatalogDbClientTest.java
+++ b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/db/catalog/client/CatalogDbClientTest.java
@@ -197,8 +197,8 @@ public class CatalogDbClientTest extends CatalogDbAdapterBaseTest {
         assertNotNull(vnfResourceCustomization.getVnfResources());
         assertNotNull(vnfResourceCustomization.getVfModuleCustomizations());
         assertEquals("vSAMP10a", vnfResourceCustomization.getVnfResources().getModelName());
-        assertTrue("skip post instantiation configuration",
-                vnfResourceCustomization.isSkipPostInstConf().booleanValue());
+        assertFalse("skip post instantiation configuration",
+                vnfResourceCustomization.getSkipPostInstConf().booleanValue());
     }
 
     @Test
@@ -617,7 +617,7 @@ public class CatalogDbClientTest extends CatalogDbAdapterBaseTest {
         assertEquals("modelInstanceName", "PNF routing", pnfResourceCustomization.getModelInstanceName());
         assertEquals("blueprintName", "test_configuration_restconf", pnfResourceCustomization.getBlueprintName());
         assertEquals("blueprintVersion", "1.0.0", pnfResourceCustomization.getBlueprintVersion());
-        assertTrue("skip post instantiation configuration", pnfResourceCustomization.isSkipPostInstConf());
+        assertTrue("skip post instantiation configuration", pnfResourceCustomization.getSkipPostInstConf());
         PnfResource pnfResource = pnfResourceCustomization.getPnfResources();
         assertNotNull(pnfResource);
         assertEquals("PNFResource modelUUID", "ff2ae348-214a-11e7-93ae-92361f002680", pnfResource.getModelUUID());

diff --git a/adapters/mso-catalog-db-adapter/src/test/resources/db/migration/afterMigrate.sql b/adapters/mso-catalog-db-adapter/src/test/resources/db/migration/afterMigrate.sql
index 53a457d..c975f8b 100644 (file)
--- a/adapters/mso-catalog-db-adapter/src/test/resources/db/migration/afterMigrate.sql
+++ b/adapters/mso-catalog-db-adapter/src/test/resources/db/migration/afterMigrate.sql
@@ -64,9 +64,9 @@ insert into vnf_resource(orchestration_mode, description, creation_timestamp, mo
 ('HEAT', '1607 vSAMP10a - inherent network', '2017-04-14 21:46:28', 'ff2ae348-214a-11e7-93ae-92361f002672', '', '', '2fff5b20-214b-11e7-93ae-92361f002671', '2.0', 'vSAMP10a', 'VF', 'ff874603-4222-11e7-9252-005056850d2e');
 
 
-insert into vnf_resource_customization(model_customization_uuid, model_instance_name, min_instances, max_instances, availability_zone_max_count, nf_type, nf_role, nf_function, nf_naming_code, creation_timestamp, vnf_resource_model_uuid, multi_stage_design,service_model_uuid,resource_input) values
-('68dc9a92-214c-11e7-93ae-92361f002671', 'vSAMP10a 1', '0', '0', '0', 'vSAMP', 'vSAMP', 'vSAMP', 'vSAMP', '2017-05-26 15:08:24', 'ff2ae348-214a-11e7-93ae-92361f002671', null,'5df8b6de-2083-11e7-93ae-92361f002671', '{\\\"resource_input\\\":\\\"test\\\"}'),
-('68dc9a92-214c-11e7-93ae-92361f002672', 'vSAMP10a 2', '0', '0', '0', 'vSAMP', 'vSAMP', 'vSAMP', 'vSAMP', '2017-05-26 15:08:24', 'ff2ae348-214a-11e7-93ae-92361f002672', null,'5df8b6de-2083-11e7-93ae-92361f002672', null);
+insert into vnf_resource_customization(model_customization_uuid, model_instance_name, min_instances, max_instances, availability_zone_max_count, nf_type, nf_role, nf_function, nf_naming_code, creation_timestamp, vnf_resource_model_uuid, multi_stage_design,service_model_uuid,resource_input,skip_post_instantiation_configuration) values
+('68dc9a92-214c-11e7-93ae-92361f002671', 'vSAMP10a 1', '0', '0', '0', 'vSAMP', 'vSAMP', 'vSAMP', 'vSAMP', '2017-05-26 15:08:24', 'ff2ae348-214a-11e7-93ae-92361f002671', null,'5df8b6de-2083-11e7-93ae-92361f002671', '{\\\"resource_input\\\":\\\"test\\\"}', false),
+('68dc9a92-214c-11e7-93ae-92361f002672', 'vSAMP10a 2', '0', '0', '0', 'vSAMP', 'vSAMP', 'vSAMP', 'vSAMP', '2017-05-26 15:08:24', 'ff2ae348-214a-11e7-93ae-92361f002672', null,'5df8b6de-2083-11e7-93ae-92361f002672', null, false);
 
 
 

diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/client/ASDCControllerITTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/client/ASDCControllerITTest.java
index bf2b8ad..556e5b9 100644 (file)
--- a/asdc-controller/src/test/java/org/onap/so/asdc/client/ASDCControllerITTest.java
+++ b/asdc-controller/src/test/java/org/onap/so/asdc/client/ASDCControllerITTest.java
@@ -262,7 +262,7 @@ public class ASDCControllerITTest extends BaseTest {
                     pnfCustomization.getBlueprintName());
             assertEquals("cds blueprint version(sdnc_model_version property)", "v1.4.0",
                     pnfCustomization.getBlueprintVersion());
-            assertTrue("skip post instantiation configuration", pnfCustomization.isSkipPostInstConf());
+            assertTrue("skip post instantiation configuration", pnfCustomization.getSkipPostInstConf());
             assertEquals("controller actor", "SO-REF-DATA", pnfCustomization.getControllerActor());
 
             /**
@@ -533,7 +533,7 @@ public class ASDCControllerITTest extends BaseTest {
             assertEquals("cds blueprint version(sdnc_model_version property)", "1.0.0",
                     pnfCustomization.getBlueprintVersion());
             assertEquals("default software version", "4.0.0", pnfCustomization.getDefaultSoftwareVersion());
-            assertTrue("skip post instantiation configuration", pnfCustomization.isSkipPostInstConf());
+            assertTrue("skip post instantiation configuration", pnfCustomization.getSkipPostInstConf());
             assertEquals("controller actor", "SO-REF-DATA", pnfCustomization.getControllerActor());
 
             /**
@@ -643,7 +643,7 @@ public class ASDCControllerITTest extends BaseTest {
             assertEquals("cds blueprint version(sdnc_model_version property)", "1.0.0",
                     pnfCustomization.getBlueprintVersion());
             assertEquals("default software version", "foo-123", pnfCustomization.getDefaultSoftwareVersion());
-            assertTrue("skip post instantiation configuration", pnfCustomization.isSkipPostInstConf());
+            assertTrue("skip post instantiation configuration", pnfCustomization.getSkipPostInstConf());
             assertEquals("controller actor", "SO-REF-DATA", pnfCustomization.getControllerActor());
 
             /**

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/delegate/ConfigCheckerDelegate.java b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/delegate/ConfigCheckerDelegate.java
index 37b9376..0136c30 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/delegate/ConfigCheckerDelegate.java
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/delegate/ConfigCheckerDelegate.java
@@ -73,7 +73,7 @@ public class ConfigCheckerDelegate implements JavaDelegate {
                     catalogDbClient.getPnfResourceCustomizationByModelUuid(serviceModelUuid);
             if (pnfCustomizations != null && !pnfCustomizations.isEmpty()) {
                 PnfResourceCustomization pnfResourceCustomization = pnfCustomizations.get(0);
-                boolean skipPostInstantiationConfiguration = pnfResourceCustomization.isSkipPostInstConf();
+                boolean skipPostInstantiationConfiguration = pnfResourceCustomization.getSkipPostInstConf();
                 delegateExecution.setVariable(SKIP_POST_INSTANTIATION_CONFIGURATION,
                         skipPostInstantiationConfiguration);
                 delegateExecution.setVariable(PRC_BLUEPRINT_NAME, pnfResourceCustomization.getBlueprintName());

diff --git a/bpmn/so-bpmn-infrastructure-flows/pom.xml b/bpmn/so-bpmn-infrastructure-flows/pom.xml
index d094424..0602522 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-flows/pom.xml
+++ b/bpmn/so-bpmn-infrastructure-flows/pom.xml
@@ -11,7 +11,7 @@
   <packaging>jar</packaging>
   <properties>
     <assertj.core.version>1.7.0</assertj.core.version>
-    <grpc.version>1.17.1</grpc.version>
+    <grpc.version>1.25.0</grpc.version>
   </properties>
   <build>
     <plugins>

diff --git a/bpmn/so-bpmn-infrastructure-flows/src/test/java/org/onap/so/GrpcNettyServer.java b/bpmn/so-bpmn-infrastructure-flows/src/test/java/org/onap/so/GrpcNettyServer.java
index 7aaf558..35c5fe1 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-flows/src/test/java/org/onap/so/GrpcNettyServer.java
+++ b/bpmn/so-bpmn-infrastructure-flows/src/test/java/org/onap/so/GrpcNettyServer.java
@@ -26,7 +26,7 @@ import javax.annotation.PostConstruct;
 import org.junit.Rule;
 import org.onap.ccsdk.cds.controllerblueprints.common.api.EventType;
 import org.onap.ccsdk.cds.controllerblueprints.common.api.Status;
-import org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingServiceGrpc.BluePrintProcessingServiceImplBase;
+import org.onap.ccsdk.cds.controllerblueprints.processing.api.BlueprintProcessingServiceGrpc.BlueprintProcessingServiceImplBase;
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput;
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput;
 import org.slf4j.Logger;
@@ -35,7 +35,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 @Component
-public class GrpcNettyServer extends BluePrintProcessingServiceImplBase {
+public class GrpcNettyServer extends BlueprintProcessingServiceImplBase {
 
     private static final Logger logger = LoggerFactory.getLogger(GrpcNettyServer.class);
 
@@ -55,7 +55,7 @@ public class GrpcNettyServer extends BluePrintProcessingServiceImplBase {
     @PostConstruct
     public void start() throws IOException {
 
-        final BluePrintProcessingServiceImplBase blueprintPrcessorImpl = new BluePrintProcessingServiceImplBase() {
+        final BlueprintProcessingServiceImplBase blueprintPrcessorImpl = new BlueprintProcessingServiceImplBase() {
             @Override
             public StreamObserver<ExecutionServiceInput> process(
                     StreamObserver<ExecutionServiceOutput> responseObserver) {

diff --git a/bpmn/so-bpmn-tasks/pom.xml b/bpmn/so-bpmn-tasks/pom.xml
index 9f7d095..276b546 100644 (file)
--- a/bpmn/so-bpmn-tasks/pom.xml
+++ b/bpmn/so-bpmn-tasks/pom.xml
@@ -164,7 +164,7 @@
       <dependency>
         <groupId>io.grpc</groupId>
         <artifactId>grpc-testing</artifactId>
-        <version>1.17.1</version>
+        <version>1.25.0</version>
         <scope>test</scope>
       </dependency>
     </dependencies>

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/SkipCDSBuildingBlockListener.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/SkipCDSBuildingBlockListener.java
index 3af839f..272c618 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/SkipCDSBuildingBlockListener.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/SkipCDSBuildingBlockListener.java
@@ -27,12 +27,15 @@ import java.util.Set;
 import org.apache.logging.log4j.util.Strings;
 import org.onap.so.bpmn.common.BBConstants;
 import org.onap.so.bpmn.common.BuildingBlockExecution;
+import org.onap.so.bpmn.common.listener.flowmanipulator.FlowManipulatorListenerRunner;
 import org.onap.so.bpmn.common.listener.flowmanipulator.PreFlowManipulator;
 import org.onap.so.bpmn.servicedecomposition.entities.ExecuteBuildingBlock;
 import org.onap.so.db.catalog.beans.PnfResourceCustomization;
 import org.onap.so.db.catalog.beans.VfModuleCustomization;
 import org.onap.so.db.catalog.beans.VnfResourceCustomization;
 import org.onap.so.db.catalog.client.CatalogDbClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -40,6 +43,8 @@ import org.springframework.util.CollectionUtils;
 @Component
 public class SkipCDSBuildingBlockListener implements PreFlowManipulator {
 
+    private static Logger logger = LoggerFactory.getLogger(SkipCDSBuildingBlockListener.class);
+
     @Autowired
     private CatalogDbClient catalogDbClient;
 
@@ -84,7 +89,8 @@ public class SkipCDSBuildingBlockListener implements PreFlowManipulator {
                 VnfResourceCustomization vrc = catalogDbClient.findVnfResourceCustomizationInList(customizationUUID,
                         vnfResourceCustomizations);
                 if (null != vrc) {
-                    boolean skipConfigVNF = vrc.isSkipPostInstConf().booleanValue();
+                    logger.debug("getSkipPostInstConf value: " + vrc.getSkipPostInstConf().booleanValue());
+                    boolean skipConfigVNF = vrc.getSkipPostInstConf().booleanValue();
                     currentSequenceSkipCheck(execution, skipConfigVNF);
                 }
 
@@ -96,7 +102,8 @@ public class SkipCDSBuildingBlockListener implements PreFlowManipulator {
                     catalogDbClient.getVfModuleCustomizationByModelCuztomizationUUID(customizationUUID);
 
             if (null != vfc) {
-                boolean skipVfModule = vfc.isSkipPostInstConf();
+                logger.debug("getSkipPostInstConf value: " + vfc.getSkipPostInstConf().booleanValue());
+                boolean skipVfModule = vfc.getSkipPostInstConf();
                 currentSequenceSkipCheck(execution, skipVfModule);
             }
 
@@ -106,7 +113,8 @@ public class SkipCDSBuildingBlockListener implements PreFlowManipulator {
                     catalogDbClient.getPnfResourceCustomizationByModelCustomizationUUID(customizationUUID);
 
             if (null != pnfResourceCustomization) {
-                boolean skipConfigPNF = pnfResourceCustomization.isSkipPostInstConf();
+                logger.debug("getSkipPostInstConf value: " + pnfResourceCustomization.getSkipPostInstConf());
+                boolean skipConfigPNF = pnfResourceCustomization.getSkipPostInstConf();
                 currentSequenceSkipCheck(execution, skipConfigPNF);
             }
         }

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/SkipConfigVnfListener.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/SkipConfigVnfListener.java
index 5ffba45..8c74e3d 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/SkipConfigVnfListener.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/SkipConfigVnfListener.java
@@ -34,7 +34,7 @@ public class SkipConfigVnfListener implements PreFlowManipulator {
         if (vnfResourceCustomizations != null && !vnfResourceCustomizations.isEmpty()) {
             VnfResourceCustomization vrc =
                     catalogDbClient.findVnfResourceCustomizationInList(vnfCustomizationUUID, vnfResourceCustomizations);
-            boolean skipConfigVNF = vrc.isSkipPostInstConf().booleanValue();
+            boolean skipConfigVNF = vrc.getSkipPostInstConf().booleanValue();
             if (skipConfigVNF) {
                 execution.setVariable(BBConstants.G_CURRENT_SEQUENCE,
                         ((int) execution.getVariable(BBConstants.G_CURRENT_SEQUENCE)) + 1);

diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/GrpcNettyServer.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/GrpcNettyServer.java
index e089da6..a6e2922 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/GrpcNettyServer.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/GrpcNettyServer.java
@@ -24,7 +24,6 @@ import io.grpc.stub.StreamObserver;
 import io.grpc.testing.GrpcCleanupRule;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
@@ -32,7 +31,7 @@ import javax.annotation.PostConstruct;
 import org.junit.Rule;
 import org.onap.ccsdk.cds.controllerblueprints.common.api.EventType;
 import org.onap.ccsdk.cds.controllerblueprints.common.api.Status;
-import org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingServiceGrpc.BluePrintProcessingServiceImplBase;
+import org.onap.ccsdk.cds.controllerblueprints.processing.api.BlueprintProcessingServiceGrpc.BlueprintProcessingServiceImplBase;
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput;
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput;
 import org.slf4j.Logger;
@@ -41,7 +40,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 @Component
-public class GrpcNettyServer extends BluePrintProcessingServiceImplBase {
+public class GrpcNettyServer extends BlueprintProcessingServiceImplBase {
 
     private static final Logger logger = LoggerFactory.getLogger(GrpcNettyServer.class);
 
@@ -61,7 +60,7 @@ public class GrpcNettyServer extends BluePrintProcessingServiceImplBase {
     @PostConstruct
     public void start() throws IOException {
 
-        final BluePrintProcessingServiceImplBase blueprintPrcessorImpl = new BluePrintProcessingServiceImplBase() {
+        final BlueprintProcessingServiceImplBase blueprintPrcessorImpl = new BlueprintProcessingServiceImplBase() {
             @Override
             public StreamObserver<ExecutionServiceInput> process(
                     StreamObserver<ExecutionServiceOutput> responseObserver) {

diff --git a/common/pom.xml b/common/pom.xml
index 4535923..dd296e8 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -11,10 +11,10 @@
   <name>common</name>
   <description>MSO Common classes:- Logger</description>
   <properties>
-    <grpc.version>1.17.1</grpc.version>
-    <protobuf.version>3.6.1</protobuf.version>
+    <grpc.version>1.25.0</grpc.version>
+    <protobuf.version>3.10.0</protobuf.version>
     <grpc.netty.version>4.1.30.Final</grpc.netty.version>
-    <ccsdk.version>0.4.2</ccsdk.version>
+    <ccsdk.version>1.1.2</ccsdk.version>
   </properties>
   <dependencies>
     <dependency>
@@ -163,9 +163,15 @@
     </dependency>
     <!-- CDS dependencies -->
     <dependency>
-      <groupId>org.onap.ccsdk.cds.components</groupId>
-      <artifactId>proto-definition</artifactId>
+      <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId>
+      <artifactId>blueprint-proto</artifactId>
       <version>${ccsdk.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>io.springfox</groupId>
+          <artifactId>springfox-boot-starter</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <!-- protobuf dependencies -->
     <dependency>

diff --git a/common/src/main/java/org/onap/so/client/cds/CDSProcessingClient.java b/common/src/main/java/org/onap/so/client/cds/CDSProcessingClient.java
index fa309b5..e40b936 100644 (file)
--- a/common/src/main/java/org/onap/so/client/cds/CDSProcessingClient.java
+++ b/common/src/main/java/org/onap/so/client/cds/CDSProcessingClient.java
@@ -22,7 +22,6 @@ package org.onap.so.client.cds;
 
 import io.grpc.ManagedChannel;
 import io.grpc.internal.DnsNameResolverProvider;
-import io.grpc.internal.PickFirstLoadBalancerProvider;
 import io.grpc.netty.GrpcSslContexts;
 import io.grpc.netty.NettyChannelBuilder;
 import java.security.KeyStore;
@@ -81,8 +80,7 @@ public class CDSProcessingClient implements AutoCloseable {
                     "No RestProperty.CDSProperties implementation found on classpath, can't create client.");
         }
         NettyChannelBuilder builder = NettyChannelBuilder.forAddress(props.getHost(), props.getPort())
-                .nameResolverFactory(new DnsNameResolverProvider())
-                .loadBalancerFactory(new PickFirstLoadBalancerProvider());
+                .nameResolverFactory(new DnsNameResolverProvider());
         if (props.getUseSSL()) {
             log.info("Configure SSL connection");
             KeyStore ks = KeyStoreLoader.getKeyStore();

diff --git a/common/src/main/java/org/onap/so/client/cds/CDSProcessingHandler.java b/common/src/main/java/org/onap/so/client/cds/CDSProcessingHandler.java
index 6097f7e..a0a5577 100644 (file)
--- a/common/src/main/java/org/onap/so/client/cds/CDSProcessingHandler.java
+++ b/common/src/main/java/org/onap/so/client/cds/CDSProcessingHandler.java
@@ -24,8 +24,8 @@ import io.grpc.ManagedChannel;
 import io.grpc.stub.StreamObserver;
 import java.util.concurrent.CountDownLatch;
 import org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers;
-import org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingServiceGrpc;
-import org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingServiceGrpc.BluePrintProcessingServiceStub;
+import org.onap.ccsdk.cds.controllerblueprints.processing.api.BlueprintProcessingServiceGrpc;
+import org.onap.ccsdk.cds.controllerblueprints.processing.api.BlueprintProcessingServiceGrpc.BlueprintProcessingServiceStub;
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput;
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput;
 import org.slf4j.Logger;
@@ -50,7 +50,7 @@ class CDSProcessingHandler {
 
         final CountDownLatch finishLatch = new CountDownLatch(1);
 
-        final BluePrintProcessingServiceStub asyncStub = BluePrintProcessingServiceGrpc.newStub(channel);
+        final BlueprintProcessingServiceStub asyncStub = BlueprintProcessingServiceGrpc.newStub(channel);
 
         final StreamObserver<ExecutionServiceOutput> responseObserver = new StreamObserver<ExecutionServiceOutput>() {
             @Override

diff --git a/common/src/test/java/org/onap/so/client/cds/CDSProcessingClientTest.java b/common/src/test/java/org/onap/so/client/cds/CDSProcessingClientTest.java
index 5792c28..b92326c 100644 (file)
--- a/common/src/test/java/org/onap/so/client/cds/CDSProcessingClientTest.java
+++ b/common/src/test/java/org/onap/so/client/cds/CDSProcessingClientTest.java
@@ -41,7 +41,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.Mock;
 import org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers;
-import org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingServiceGrpc.BluePrintProcessingServiceImplBase;
+import org.onap.ccsdk.cds.controllerblueprints.processing.api.BlueprintProcessingServiceGrpc.BlueprintProcessingServiceImplBase;
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput;
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput;
 
@@ -72,7 +72,7 @@ public class CDSProcessingClientTest {
 
         client = new CDSProcessingClient(InProcessChannelBuilder.forName(serverName).directExecutor().build(), handler);
 
-        final BluePrintProcessingServiceImplBase routeChatImpl = new BluePrintProcessingServiceImplBase() {
+        final BlueprintProcessingServiceImplBase routeChatImpl = new BlueprintProcessingServiceImplBase() {
             @Override
             public StreamObserver<ExecutionServiceInput> process(
                     StreamObserver<ExecutionServiceOutput> responseObserver) {

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index c4c14b0..90fd8aa 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -14,20 +14,20 @@ The SO provides the highest level of service orchestration in the ONAP architect
 Release Notes
 =============
 
-Version: 1.8.3
+Version: 8.0
 ==============
 
-:Release Date: 2021-04-10
+:Release Date: 2021-04-19
 
 SO Release Image Versions
 --------------------------
  - so-bpmn-infra
 
-    :Version: 1.8.1
+    :Version: 1.8.2
 
  - so-catalog-db-adapter
 
-    :Version: 1.8.1
+    :Version: 1.8.2
 
  - so-admin-cockpit
 
@@ -39,19 +39,19 @@ SO Release Image Versions
 
  - so-openstack-adapter
 
-    :Version: 1.8.1
+    :Version: 1.8.2
 
  - so-request-db-adapter
 
-    :Version: 1.8.1
+    :Version: 1.8.2
 
  - so-sdc-controller
 
-    :Version: 1.8.1
+    :Version: 1.8.2
 
  - so-sdnc-adapter
 
-    :Version: 1.8.1
+    :Version: 1.8.2
 
  - so-sol003-adapter
 
@@ -59,7 +59,7 @@ SO Release Image Versions
 
  - so-api-handler-infra
 
-    :Version: 1.8.1
+    :Version: 1.8.2
 
  - so-etsi-nfvo-ns-lcm
 
@@ -81,28 +81,26 @@ The key delivereable for this release is refactoring SO for better internal arch
 
 **Epics**
 
+*  `SO-3473 <https://jira.onap.org/browse/SO-3473>`_ - Refactor SO to enhance the usability
+*  `SO-3381 <https://jira.onap.org/browse/SO-3381>`_ - SO Impacts for E2E Network Slicing in Honolulu
+*  `SO-3206 <https://jira.onap.org/browse/SO-3206>`_ - Support for NS LCM and Workflows Management
+*  `SO-3493 <https://jira.onap.org/browse/SO-3493>`_ - Java 11 and Python 3 upgrades
 
 **Stories**
 
-The full list of implemented tasks is available on `JIRA GUILIN STORY <https://jira.onap.org/issues/?jql=project%20%3D%20%22Service%20Orchestrator%22%20%20AND%20issuetype%20%3D%20story%20AND%20fixVersion%20%3D%20%22honolulu%20Release%22>`_
+The full list of implemented tasks is available on `JIRA Honolulu STORY <https://jira.onap.org/issues/?jql=project%20%3D%20%22Service%20Orchestrator%22%20%20AND%20issuetype%20%3D%20story%20AND%20fixVersion%20%3D%20%22honolulu%20Release%22>`_
 Listed below are key functional jira stories handled in the Honolulu release:
 
 
 **Tasks**
 
-The full list of implemented tasks is available on `JIRA GUILIN TASKS <https://jira.onap.org/issues/?jql=project%20%3D%20%22Service%20Orchestrator%22%20%20AND%20issuetype%20%3D%20Task%20AND%20fixVersion%20%3D%20%22honolulu%20Release%22>`_
-Listed below are highest and high piority jira tasks handled in the Guilin release:
-
-*  `SO-3205 <https://jira.onap.org/browse/SO-3205>`_ - E2E Network Slicing: Improvements for NST/NSI Selection callback
-*  `SO-3120 <https://jira.onap.org/browse/SO-3120>`_ - Create swagger api for software upgrade in SO
-*  `SO-2915 <https://jira.onap.org/browse/SO-2915>`_ - Upgrade Vulnerable Direct Dependencies
-
+The full list of implemented tasks is available on `JIRA Honolulu TASKS <https://jira.onap.org/issues/?jql=project%20%3D%20%22Service%20Orchestrator%22%20%20AND%20issuetype%20%3D%20Task%20AND%20fixVersion%20%3D%20%22honolulu%20Release%22>`_
 
 **Bug Fixes**
 
-The full list of fixed bugs is available on `JIRA GUILIN BUGS 
+The full list of fixed bugs is available on `JIRA Honolulu BUGS 
 <https://jira.onap.org/issues/?jql=project%20%3D%20%22Service%20Orchestrator%22%20%20AND%20issuetype%20%3D%20Bug%20AND%20fixVersion%20%3D%20%22honolulu%20Release%22>`_
-Listed below are highest and high piority jira tasks handled in the Guilin release:
+
 
 
 Security Notes
@@ -120,9 +118,9 @@ Quick Links:
 - `Passing Badge information for SDC <https://bestpractices.coreinfrastructure.org/en/projects/1702>`__
 
 **Known Issues**
-*  `SO-3403 <https://jira.onap.org/browse/SO-3403>`_ - The functionality of the SO cnf-adapter will be tested further and will be delivered by the Guilin Maintenance Release as a 1.7.11 patch.
-*  `SO-3237 <https://jira.onap.org/browse/SO-SO-3237>`_ - Exposed HTTP port. 
-*  `SO-3414 <https://jira.onap.org/browse/SO-SO-3414>`_ - Search Query does not contain get model data for vFW closed loop. 
+*  `SO-3628 <https://jira.onap.org/browse/SO-3628>`_ - SO cannot send CDS request due to grpc schema problem.
+*  `SO-3626 <https://jira.onap.org/browse/SO-3626>`_ - SO does not requests CDS for skipPostInstantiation flag set to False.
+*  `SO-3237 <https://jira.onap.org/browse/SO-3237>`_ - Exposed HTTP port. 
 
 
 **Upgrade Notes**
@@ -131,7 +129,7 @@ Quick Links:
 
 **Deprecation Notes**
 
-       SO modules Ve-Vnfm-adapter and appc-orchestrator are deprectaed for the Guilin release.
+       SO modules Ve-Vnfm-adapter and appc-orchestrator are deprectaed for the Honolulu release.
 
 **Other**
 

diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceCustomization.java
index 2dea0bb..0cfb253 100644 (file)
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceCustomization.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceCustomization.java
@@ -223,7 +223,7 @@ public class PnfResourceCustomization implements Serializable {
         this.blueprintVersion = blueprintVersion;
     }
 
-    public boolean isSkipPostInstConf() {
+    public boolean getSkipPostInstConf() {
         return skipPostInstConf;
     }
 

diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Service.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Service.java
index 3cca869..b4c75ba 100644 (file)
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Service.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/Service.java
@@ -460,7 +460,7 @@ public class Service implements Serializable {
         this.blueprintVersion = blueprintVersion;
     }
 
-    public Boolean isSkipPostInstConf() {
+    public Boolean getSkipPostInstConf() {
         return skipPostInstConf;
     }
 

diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VfModuleCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VfModuleCustomization.java
index f745bb8..605fdef 100644 (file)
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VfModuleCustomization.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VfModuleCustomization.java
@@ -243,7 +243,7 @@ public class VfModuleCustomization implements Serializable {
         this.cvnfcCustomization = cvnfcCustomization;
     }
 
-    public Boolean isSkipPostInstConf() {
+    public Boolean getSkipPostInstConf() {
         return skipPostInstConf;
     }
 

diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResourceCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResourceCustomization.java
index 740e51a..174c5a2 100644 (file)
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResourceCustomization.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResourceCustomization.java
@@ -327,7 +327,7 @@ public class VnfResourceCustomization implements Serializable {
         this.blueprintVersion = blueprintVersion;
     }
 
-    public Boolean isSkipPostInstConf() {
+    public Boolean getSkipPostInstConf() {
         return skipPostInstConf;
     }
 

diff --git a/mso-catalog-db/src/test/java/org/onap/so/db/catalog/data/repository/PnfCustomizationRepositoryTest.java b/mso-catalog-db/src/test/java/org/onap/so/db/catalog/data/repository/PnfCustomizationRepositoryTest.java
index d0c621d..5477e3e 100644 (file)
--- a/mso-catalog-db/src/test/java/org/onap/so/db/catalog/data/repository/PnfCustomizationRepositoryTest.java
+++ b/mso-catalog-db/src/test/java/org/onap/so/db/catalog/data/repository/PnfCustomizationRepositoryTest.java
@@ -50,7 +50,7 @@ public class PnfCustomizationRepositoryTest extends BaseTest {
         assertEquals("modelInstanceName", "PNF routing", pnfResourceCustomization.getModelInstanceName());
         assertEquals("blueprintName", "test_configuration_restconf", pnfResourceCustomization.getBlueprintName());
         assertEquals("blueprintVersion", "1.0.0", pnfResourceCustomization.getBlueprintVersion());
-        assertTrue("skip post instantiation configuration", pnfResourceCustomization.isSkipPostInstConf());
+        assertTrue("skip post instantiation configuration", pnfResourceCustomization.getSkipPostInstConf());
         PnfResource pnfResource = pnfResourceCustomization.getPnfResources();
         assertNotNull(pnfResource);