Merge "update dmaap-datarouter images"

diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env
index ab18556..42726e5 100644 (file)
--- a/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@ -5,7 +5,7 @@ parameters:
   apt_proxy: 192.168.31.204:8000
   docker_proxy: 192.168.31.204:5000
 
-  rancher_vm_flavor: m2.large
+  rancher_vm_flavor: m1.large
   k8s_vm_flavor: m4.xlarge
   etcd_vm_flavor: m1.medium
   orch_vm_flavor: m1.medium
@@ -65,3 +65,15 @@ parameters:
       replicaCount: 3
       config:
         enableClustering: true
+    aai:
+      liveness:
+        initialDelaySeconds: 120
+      aai-data-router:
+        liveness:
+          initialDelaySeconds: 120
+      aai-sparky-be:
+        liveness:
+          initialDelaySeconds: 120
+      aai-spike:
+        liveness:
+          initialDelaySeconds: 120

diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index 54dcf9a..6d471ff 100644 (file)
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -66,3 +66,15 @@ parameters:
       replicaCount: 3
       config:
         enableClustering: true
+    aai:
+      liveness:
+        initialDelaySeconds: 120
+      aai-data-router:
+        liveness:
+          initialDelaySeconds: 120
+      aai-sparky-be:
+        liveness:
+          initialDelaySeconds: 120
+      aai-spike:
+        liveness:
+          initialDelaySeconds: 120

diff --git a/test/vcpe/cleanvGMUX.py b/test/vcpe/cleanvGMUX.py
index 29f35ae..8b2751f 100755 (executable)
--- a/test/vcpe/cleanvGMUX.py
+++ b/test/vcpe/cleanvGMUX.py
@@ -7,12 +7,12 @@ import json
 from datetime import datetime
 import time
 
-gmux_ip = '10.12.6.115'
+gmux_ip = ''
 logging.basicConfig(level=logging.DEBUG, format='%(message)s')
 logger = logging.getLogger('')
 headers = {'Content-Type': 'application/json', 'Accept': 'application/json'}
 auth = 'admin', 'admin'
-base_url = 'http://{0}:8183/restconf/config/ietf-interfaces:interfaces'.format(gmux_ip)
+base_url = ''
 
 def list_interface():
     url = base_url
@@ -54,6 +54,8 @@ def delete_interface(interface_name):
     logger.debug(r)
         
 if __name__ == '__main__':
+    gmux_ip = sys.argv[1]
+    base_url = 'http://{0}:8183/restconf/config/ietf-interfaces:interfaces'.format(gmux_ip)
     logger.debug('---------------------------------------------------------------')
     logger.debug('list interfaces before cleaning gmux')
     list_interface()

diff --git a/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json
index b9e7c3d..f453aaf 100644 (file)
--- a/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json
+++ b/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json
@@ -17,6 +17,14 @@
                        "vf-module-topology": {
                                "vf-module-parameters":  {
                                        "param": [
+                                        {
+                                            "name": "vcpe_image_name",
+                                            "value": "vgw-casa-base-ubuntu-16-04"
+                                        },
+                                        {
+                                            "name": "vcpe_flavor_name",
+                                            "value": "m1.medium"
+                                        },
                                        {
                                            "name": "public_net_id", 
                                            "value": "${public_net_id}"

diff --git a/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json
index f56e8f4..cda93be 100644 (file)
--- a/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json
+++ b/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json
@@ -17,6 +17,14 @@
         "VNF-API:vnf-topology-information": {
             "VNF-API:vnf-assignments": {}, 
             "VNF-API:vnf-parameters": [
+                {
+                    "vnf-parameter-name": "vcpe_image_name", 
+                    "vnf-parameter-value": "vgw-casa-base-ubuntu-16-04"
+                }, 
+                {
+                    "vnf-parameter-name": "vcpe_flavor_name", 
+                    "vnf-parameter-value": "m1.medium"
+                }, 
                 {
                     "vnf-parameter-name": "public_net_id", 
                     "vnf-parameter-value": "${public_net_id}"
@@ -47,15 +55,15 @@
                 }, 
                 {
                     "vnf-parameter-name": "vgw_private_ip_0", 
-                    "vnf-parameter-value": "10.5.0.116"
+                    "vnf-parameter-value": "10.5.0.125"
                 }, 
                 {
                     "vnf-parameter-name": "vgw_private_ip_1", 
-                    "vnf-parameter-value": "10.0.101.116"
+                    "vnf-parameter-value": "10.0.101.125"
                 }, 
                 {
                     "vnf-parameter-name": "vgw_private_ip_2", 
-                    "vnf-parameter-value": "10.2.0.31"
+                    "vnf-parameter-value": "10.2.0.40"
                 }, 
                 {
                     "vnf-parameter-name": "vgw_name_0", 
@@ -67,7 +75,7 @@
                 }, 
                 {
                     "vnf-parameter-name": "vg_vgmux_tunnel_vni", 
-                    "vnf-parameter-value": "116"
+                    "vnf-parameter-value": "125"
                 }, 
                 {
                     "vnf-parameter-name": "onap_private_net_id", 

diff --git a/test/vcpe/soutils.py b/test/vcpe/soutils.py
index 6d6a27e..6cddd6d 100755 (executable)
--- a/test/vcpe/soutils.py
+++ b/test/vcpe/soutils.py
@@ -217,7 +217,7 @@ class SoUtils:
 
         # create service
         instance_name = '_'.join([self.vcpecommon.instance_name_prefix['service'],
-                                  parser.svc_model['modelName'], name_suffix])
+                                  parser.svc_model['modelName'][0:10], name_suffix])
         instance_name = instance_name.lower()
         req = self.generate_custom_service_request(instance_name, parser.svc_model, brg_mac)
         self.logger.info(json.dumps(req, indent=2, sort_keys=True))

diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv
index 03fb40e..a1a5777 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@ -53,11 +53,11 @@ 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.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/framework,1.2.3-STAGING
+onap/multicloud/openstack-newton,1.2.3-STAGING
+onap/multicloud/openstack-ocata,1.2.3-STAGING
+onap/multicloud/openstack-pike,1.2.3-STAGING
+onap/multicloud/openstack-windriver,1.2.3-STAGING
 onap/multicloud/vio,1.2.2-STAGING
 onap/multicloud/vio-vesagent,1.0.0
 onap/music/cassandra_3_11,3.0.24
@@ -135,18 +135,18 @@ onap/tproxy-config,2.1-STAGING-latest
 onap/usecase-ui,1.2.2-STAGING-latest
 onap/usecase-ui-server,1.2.1-STAGING-latest
 onap/validation,1.3-STAGING-latest
-onap/vfc/catalog,1.2.1-STAGING-latest
-onap/vfc/db,1.2.1-STAGING-latest
+onap/vfc/catalog,1.2.2-STAGING-latest
+onap/vfc/db,1.2.2-STAGING-latest
 onap/vfc/emsdriver,1.2.1-STAGING-latest
-onap/vfc/gvnfmdriver,1.2.1-STAGING-latest
+onap/vfc/gvnfmdriver,1.2.2-STAGING-latest
 onap/vfc/jujudriver,1.2.1-STAGING-latest
 onap/vfc/multivimproxy,1.2.1-STAGING-latest
 onap/vfc/nfvo/svnfm/huawei,1.2.1-STAGING-latest
 onap/vfc/nfvo/svnfm/nokia,1.1.0-STAGING-latest
 onap/vfc/nfvo/svnfm/nokiav2,1.3.1-STAGING-latest
-onap/vfc/nslcm,1.2.1-STAGING-latest
+onap/vfc/nslcm,1.2.2-STAGING-latest
 onap/vfc/resmanagement,1.2.1-STAGING-latest
-onap/vfc/vnflcm,1.2.1-STAGING-latest
+onap/vfc/vnflcm,1.2.2-STAGING-latest
 onap/vfc/vnfmgr,1.2.1-STAGING-latest
 onap/vfc/vnfres,1.2.1-STAGING-latest
 onap/vfc/wfengine-activiti,1.2.0-STAGING-latest

diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index 747bde8..79a7e0b 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -53,11 +53,11 @@ onap/model-loader,1.3.1
 onap/msb/msb_apigateway,1.2.1
 onap/msb/msb_discovery,1.2.1
 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/framework,1.2.2
+onap/multicloud/openstack-newton,1.2.2
+onap/multicloud/openstack-ocata,1.2.2
+onap/multicloud/openstack-pike,1.2.2
+onap/multicloud/openstack-windriver,1.2.2
 onap/multicloud/vio,1.2.1
 onap/multicloud/vio-vesagent,1.0.0
 onap/music/cassandra_3_11,3.0.24
@@ -135,18 +135,18 @@ onap/testsuite,1.3.2
 onap/usecase-ui,1.2.2
 onap/usecase-ui-server,1.2.1
 onap/validation,1.3.1
-onap/vfc/catalog,1.2.1
-onap/vfc/db,1.2.1
+onap/vfc/catalog,1.2.2
+onap/vfc/db,1.2.2
 onap/vfc/emsdriver,1.2.1
-onap/vfc/gvnfmdriver,1.2.1
+onap/vfc/gvnfmdriver,1.2.2
 onap/vfc/jujudriver,1.2.1
 onap/vfc/multivimproxy,1.2.1
 onap/vfc/nfvo/svnfm/huawei,1.2.1
 onap/vfc/nfvo/svnfm/nokia,1.1.0
 onap/vfc/nfvo/svnfm/nokiav2,1.3.0
-onap/vfc/nslcm,1.2.1
+onap/vfc/nslcm,1.2.2
 onap/vfc/resmanagement,1.2.1
-onap/vfc/vnflcm,1.2.1
+onap/vfc/vnflcm,1.2.2
 onap/vfc/vnfmgr,1.2.1
 onap/vfc/vnfres,1.2.1
 onap/vfc/wfengine-activiti,1.2.0

diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv
index 1ea5518..143de17 100644 (file)
--- a/version-manifest/src/main/resources/java-manifest.csv
+++ b/version-manifest/src/main/resources/java-manifest.csv
@@ -218,10 +218,10 @@ 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.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.framework,multivimbroker,1.2.2
+org.onap.multicloud.openstack,newton,1.2.2
+org.onap.multicloud.openstack,ocata,1.2.2
+org.onap.multicloud.openstack,windriver,1.2.2
 org.onap.multicloud.openstack.vmware,vesagent,1.0.0
 org.onap.multicloud.openstack.vmware,vio,1.2.1
 org.onap.music,MUSIC,3.0.23
@@ -247,19 +247,19 @@ org.onap.sdnc.northbound,generic-resource-api.provider,1.4.2
 org.onap.sdnc.northbound,vnfapi-provider,1.4.2
 org.onap.sdnc.northbound,vnftools-provider,1.4.2
 org.onap.usecase-ui.server,usecase-ui-server,1.2.1
-org.onap.vfc.gvnfm.vnflcm.lcm,vfc-gvnfm-vnflcm-lcm,1.2.1
+org.onap.vfc.gvnfm.vnflcm.lcm,vfc-gvnfm-vnflcm-lcm,1.2.2
 org.onap.vfc.gvnfm.vnfmgr.mgr,vfc-gvnfm-vnfmgr-mgr,1.2.1
 org.onap.vfc.gvnfm.vnfres.res,vfc-gvnfm-vnfres-res,1.2.1
-org.onap.vfc.nfvo.catalog,vfc-nfvo-catalog,1.2.1
-org.onap.vfc.nfvo.db,vfc-nfvo-db,1.2.1
+org.onap.vfc.nfvo.catalog,vfc-nfvo-catalog,1.2.2
+org.onap.vfc.nfvo.db,vfc-nfvo-db,1.2.2
 org.onap.vfc.nfvo.driver.ems.ems,emsdriver-standalone,1.2.1
 org.onap.vfc.nfvo.driver.sfc.zte.sfc-driver-standalone,vfc-nfvo-driver-sfc-zte-sfc-driver,1.2.0
-org.onap.vfc.nfvo.driver.vnfm.gvnfm.gvnfmadapter,vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter,1.2.1
+org.onap.vfc.nfvo.driver.vnfm.gvnfm.gvnfmadapter,vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter,1.2.2
 org.onap.vfc.nfvo.driver.vnfm.svnfm,vfcadaptor-deployment,1.1.0
 org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter,hw-vnfmadapter-deployment,1.2.1
 org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2,driverwar,1.2.1
 org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager,vfc-nfvo-driver-vnfm-svnfm-zte-vmanager,1.2.1
-org.onap.vfc.nfvo.lcm,vfc-nfvo-lcm,1.2.1
+org.onap.vfc.nfvo.lcm,vfc-nfvo-lcm,1.2.2
 org.onap.vfc.nfvo.multivimproxy,vfc-nfvo-multivimproxy-deployment,1.2.1
 org.onap.vfc.nfvo.resmanagement,vfc-nfvo-resmanagement-deployment,1.2.1
 org.onap.vfc.nfvo.wfengine,activiti-extension,1.2.0