Merge "fixes from vCPE testing"

diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env
index 49d02c4..039f128 100644 (file)
--- a/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@ -48,9 +48,9 @@ parameters:
           openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000/v2.0"
           openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     appc:
-      replicaCount: 1
+      replicaCount: 3
       config:
-        enableClustering: false
+        enableClustering: true
         enableAAF: false
         openStackType: "OpenStackProvider"
         openStackName: "OpenStack"
@@ -62,6 +62,8 @@ parameters:
         odlUser: admin
         odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
     sdnc:
-      replicaCount: 1
+      replicaCount: 3
       config:
-        enableClustering: false
+        enableClustering: true
+    vvp:
+      enabled: true

diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index c611184..e69005e 100644 (file)
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -49,9 +49,9 @@ parameters:
           openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0"
           openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     appc:
-      replicaCount: 1
+      replicaCount: 3
       config:
-        enableClustering: false
+        enableClustering: true
         enableAAF: false
         openStackType: "OpenStackProvider"
         openStackName: "OpenStack"
@@ -63,6 +63,8 @@ parameters:
         odlUser: admin
         odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
     sdnc:
-      replicaCount: 1
+      replicaCount: 3
       config:
-        enableClustering: false
+        enableClustering: true
+    vvp:
+      enabled: true

diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml
index 689bb66..7e255db 100644 (file)
--- a/deployment/heat/onap-oom/onap-oom.yaml
+++ b/deployment/heat/onap-oom/onap-oom.yaml
@@ -128,6 +128,10 @@ resources:
         - protocol: tcp
           port_range_min: 1
           port_range_max: 65535
+        # Protocols used for vLB/vDNS use case
+        - protocol: 47
+        - protocol: 53
+        - protocol: 132
 
 
   # ONAP management private network

diff --git a/deployment/heat/onap-oom/parts/onap-oom-1.yaml b/deployment/heat/onap-oom/parts/onap-oom-1.yaml
index a96c9a3..ba3933b 100644 (file)
--- a/deployment/heat/onap-oom/parts/onap-oom-1.yaml
+++ b/deployment/heat/onap-oom/parts/onap-oom-1.yaml
@@ -125,6 +125,10 @@ resources:
         - protocol: tcp
           port_range_min: 1
           port_range_max: 65535
+        # Protocols used for vLB/vDNS use case
+        - protocol: 47
+        - protocol: 53
+        - protocol: 132
 
 
   # ONAP management private network

diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv
index a8febca..d041c93 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@ -47,13 +47,13 @@ onap/holmes/rule-management,1.2.3-STAGING-latest
 onap/model-loader,1.3-STAGING-latest
 onap/msb/msb_apigateway,1.2.2-STAGING-latest
 onap/msb/msb_discovery,1.2.2-STAGING-latest
-onap/multicloud/azure,1.2.1-SNAPSHOT
-onap/multicloud/framework,1.2.1-STAGING
-onap/multicloud/openstack-newton,1.2.1-STAGING
-onap/multicloud/openstack-ocata,1.2.1-STAGING
-onap/multicloud/openstack-pike,1.2.1-STAGING
-onap/multicloud/openstack-windriver,1.2.1-STAGING
-onap/multicloud/vio,1.2.1-STAGING
+onap/multicloud/azure,1.2.2-SNAPSHOT
+onap/multicloud/framework,1.2.2-STAGING
+onap/multicloud/openstack-newton,1.2.2-STAGING
+onap/multicloud/openstack-ocata,1.2.2-STAGING
+onap/multicloud/openstack-pike,1.2.2-STAGING
+onap/multicloud/openstack-windriver,1.2.2-STAGING
+onap/multicloud/vio,1.2.2-STAGING
 onap/multicloud/vio-vesagent,1.0.0
 onap/music/cassandra_3_11,3.0.23
 onap/music/cassandra_job,3.0.23

diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index 281c184..aa32a47 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -29,9 +29,9 @@ onap/ccsdk-dgbuilder-image,0.3.1
 onap/ccsdk-odl-oxygen-image,0.3.1
 onap/ccsdk-odlsli-image,0.3.1
 onap/champ,1.3.0
-onap/clamp,3.0.2
-onap/clamp-dashboard-kibana,3.0.2
-onap/clamp-dashboard-logstash,3.0.2
+onap/clamp,3.0.3
+onap/clamp-dashboard-kibana,3.0.3
+onap/clamp-dashboard-logstash,3.0.3
 onap/cli,2.0.4
 onap/data-router,1.3.0
 onap/dmaap/buscontroller,1.0.23
@@ -46,13 +46,13 @@ onap/holmes/rule-management,1.2.3
 onap/model-loader,1.3.0
 onap/msb/msb_apigateway,1.2.1
 onap/msb/msb_discovery,1.2.1
-onap/multicloud/azure,1.2.0
-onap/multicloud/framework,1.2.0
-onap/multicloud/openstack-newton,1.2.0
-onap/multicloud/openstack-ocata,1.2.0
-onap/multicloud/openstack-pike,1.2.0
-onap/multicloud/openstack-windriver,1.2.0
-onap/multicloud/vio,1.2.0
+onap/multicloud/azure,1.2.1
+onap/multicloud/framework,1.2.1
+onap/multicloud/openstack-newton,1.2.1
+onap/multicloud/openstack-ocata,1.2.1
+onap/multicloud/openstack-pike,1.2.1
+onap/multicloud/openstack-windriver,1.2.1
+onap/multicloud/vio,1.2.1
 onap/multicloud/vio-vesagent,1.0.0
 onap/music/cassandra_3_11,3.0.23
 onap/music/cassandra_job,3.0.23

diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv
index deaaaf1..fef503d 100644 (file)
--- a/version-manifest/src/main/resources/java-manifest.csv
+++ b/version-manifest/src/main/resources/java-manifest.csv
@@ -155,7 +155,7 @@ org.onap.ccsdk.sli.plugins,properties-node-provider,0.3.1
 org.onap.ccsdk.sli.plugins,restapi-call-node-provider,0.3.1
 org.onap.ccsdk.storage.pgaas,pgaas,1.0.0
 org.onap.ccsdk.utils,utils,1.0.0
-org.onap.clamp.clds.clamp,clamp,3.0.2
+org.onap.clamp.clds.clamp,clamp,3.0.3
 org.onap.cli,cli-framework,2.0.4
 org.onap.cli,cli-main,2.0.4
 org.onap.cli,cli-plugins-sample,2.0.4
@@ -216,15 +216,15 @@ org.onap.modeling.toscaparsers,kwalify,1.0.0
 org.onap.modeling.toscaparsers.nfvparser,modeling-toscaparsers-nfvparser,1.0.0
 org.onap.msb.java-sdk,msb-java-sdk,1.1.1
 org.onap.msb.swagger-sdk,swagger-sdk,1.1.0
-org.onap.multicloud.azure,multicloud-azure,1.2.0
-org.onap.multicloud.framework,multivimbroker,1.2.0
-org.onap.multicloud.openstack,newton,1.2.0
-org.onap.multicloud.openstack,ocata,1.2.0
-org.onap.multicloud.openstack,windriver,1.2.0
+org.onap.multicloud.azure,multicloud-azure,1.2.1
+org.onap.multicloud.framework,multivimbroker,1.2.1
+org.onap.multicloud.openstack,newton,1.2.1
+org.onap.multicloud.openstack,ocata,1.2.1
+org.onap.multicloud.openstack,windriver,1.2.1
 org.onap.multicloud.openstack.vmware,vesagent,1.0.0
-org.onap.multicloud.openstack.vmware,vio,1.2.0
+org.onap.multicloud.openstack.vmware,vio,1.2.1
 org.onap.music,MUSIC,3.0.23
-org.onap.oparent,oparent,1.2.1
+org.onap.oparent,oparent,1.2.2
 org.onap.policy.apex-pdp,apex-pdp,2.0.3
 org.onap.policy.common,common-modules,1.3.3
 org.onap.policy.distribution,distribution,2.0.2