Merge "Add workflow designer to integrate"

diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env
index 8f47e65..b18c9f1 100644 (file)
--- a/test/ete/labs/windriver/onap-openstack-template.env
+++ b/test/ete/labs/windriver/onap-openstack-template.env
@@ -147,46 +147,46 @@ y7RoiFqJtkdFQykzJemA+xOXvHLgKi/MXFsU90PCD0VJKLj8vwpX78Y=\n
   policy_branch: master
   portal_branch: release-1.3.0
   robot_branch: master
-  sdc_branch: release-1.1.0
-  sdnc_branch: release-1.1.0
+  sdc_branch: master
+  sdnc_branch: master
   vid_branch: master
   clamp_branch: master
   vnfsdk_branch: master
 
   aai_docker: v1.1.0
   aai_sparky_docker: v1.0.0
-  appc_docker: 1.1-STAGING-latest
+  appc_docker: v1.2.0
   so_docker: v1.1.0
-  dcae_docker: 1.1-latest
-  policy_docker: v1.1.0
+  dcae_docker: v1.1.0
+  policy_docker: v1.1.1
   portal_docker: v1.3.0
   robot_docker: 1.1-STAGING-latest
-  sdc_docker: v1.0.0
+  sdc_docker: 1.1-STAGING-latest
   sdnc_docker: 1.2-STAGING-latest
   vid_docker: v1.1.0
   clamp_docker: v1.1.0
-  msb_docker: v1.0.0
+  msb_docker: 1.0.0
   mvim_docker: latest
   uui_docker: latest
   esr_docker: v1.0.0
-  dgbuilder_docker: 0.1-STAGING-latest
+  dgbuilder_docker: v0.1.0
   cli_docker: v1.1.0
 
-  vfc_nokia_docker: v1.0.0
-  vfc_ztevmanagerdriver_docker: v1.0.1
-  vfc_ztesdncdriver_docker: v1.0.1
-  vfc_vnfres_docker: v1.0.1
-  vfc_vnfmgr_docker: v1.0.1
-  vfc_vnflcm_docker: v1.0.1
-  vfc_resmanagement_docker: v1.0.0
-  vfc_nslcm_docker: v1.0.1
+  vfc_nokia_docker: 1.0.2-STAGING-latest
+  vfc_ztevmanagerdriver_docker: 1.0.2-STAGING-latest
+  vfc_ztesdncdriver_docker: 1.0.0-STAGING-latest
+  vfc_vnfres_docker: 1.0.1-STAGING-latest
+  vfc_vnfmgr_docker: 1.0.1-STAGING-latest
+  vfc_vnflcm_docker: 1.0.1-STAGING-latest
+  vfc_resmanagement_docker: 1.0.0-STAGING-latest
+  vfc_nslcm_docker: 1.0.2-STAGING-latest
   vfc_huawei_docker: v1.0.0
-  vfc_jujudriver_docker: v1.0.0
-  vfc_gvnfmdriver_docker: v1.0.1
-  vfc_emsdriver_docker: v1.0.1
-  vfc_catalog_docker: v1.0.1
-  vfc_wfengine_mgrservice_docker: v1.0.0
-  vfc_wfengine_activiti_docker: v1.0.0
+  vfc_jujudriver_docker: 1.0.0-STAGING-latest
+  vfc_gvnfmdriver_docker: 1.0.1-STAGING-latest
+  vfc_emsdriver_docker: 1.0.1-STAGING-latest
+  vfc_catalog_docker: 1.0.2-STAGING-latest
+  vfc_wfengine_mgrservice_docker: 1.0.0-STAGING-latest
+  vfc_wfengine_activiti_docker: 1.0.0-STAGING-latest
 
   #####################
   #                   #

diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index 397423f..eb025d4 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -15,6 +15,12 @@ onap/modeling/javatoscachecker,v1.0.0
 onap/model-loader,1.1-STAGING-latest
 onap/msb/msb_apigateway,1.0.0
 onap/msb/msb_discovery,1.0.0
+onap/multicloud/framework,1.0.0-STAGING
+onap/multicloud/openstack-newton,1.0.0-STAGING
+onap/multicloud/openstack-ocata,1.0.0-STAGING
+onap/multicloud/openstack-windriver,1.0.0-STAGING
+onap/multicloud/vio,1.0.0-STAGING
+onap/multicloud/vio-vesagent,1.0.0-STAGING
 onap/oom/kube2msb,1.0.0
 onap/org.onap.dcaegen2.collectors.ves.vescollector,v1.1.0
 onap/org.onap.dcaegen2.deployments.bootstrap,v1.1.0
@@ -35,21 +41,21 @@ onap/sdc/sdc-workflow-designer,1.0.0-STAGING-latest
 onap/sdnc-image,1.2-STAGING-latest
 onap/search-data-service,1.1-STAGING-latest
 onap/sparky-be,1.1-STAGING-latest
-onap/vfc/catalog,1.0.2-STAGING-latest
-onap/vfc/emsdriver,1.0.1-STAGING-latest
-onap/vfc/gvnfmdriver,1.0.1-STAGING-latest
-onap/vfc/jujudriver,1.0.0-STAGING-latest
-onap/vfc/nfvo/svnfm/huawei,1.0.2-STAGING-latest
-onap/vfc/nfvo/svnfm/nokia,1.0.2-STAGING-latest
-onap/vfc/nslcm,1.0.2-STAGING-latest
-onap/vfc/resmanagement,1.0.0-STAGING-latest
-onap/vfc/vnflcm,1.0.1-STAGING-latest
-onap/vfc/vnfmgr,1.0.1-STAGING-latest
-onap/vfc/vnfres,1.0.1-STAGING-latest
-onap/vfc/wfengine-activiti,1.0.0-STAGING-latest
-onap/vfc/wfengine-mgrservice,1.0.0-STAGING-latest
-onap/vfc/ztesdncdriver,1.0.0-STAGING-latest
-onap/vfc/ztevmanagerdriver,1.0.2-STAGING-latest
+onap/vfc/catalog,v1.0.2
+onap/vfc/emsdriver,v1.0.1
+onap/vfc/gvnfmdriver,v1.0.1
+onap/vfc/jujudriver,v1.0.0
+onap/vfc/nfvo/svnfm/huawei,v1.0.2
+onap/vfc/nfvo/svnfm/nokia,v1.0.2
+onap/vfc/nslcm,v1.0.2
+onap/vfc/resmanagement,v1.0.0
+onap/vfc/vnflcm,v1.0.1
+onap/vfc/vnfmgr,v1.0.1
+onap/vfc/vnfres,v1.0.1
+onap/vfc/wfengine-activiti,v1.0.0
+onap/vfc/wfengine-mgrservice,v1.0.0
+onap/vfc/ztesdncdriver,v1.0.0
+onap/vfc/ztevmanagerdriver,v1.0.2
 onap/vnfsdk/refrepo,1.0.0
 openecomp/aai-resources,1.1-STAGING-latest
 openecomp/aai-traversal,1.1-STAGING-latest

diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv
index 93aa3e8..2e8eef9 100644 (file)
--- a/version-manifest/src/main/resources/java-manifest.csv
+++ b/version-manifest/src/main/resources/java-manifest.csv
@@ -83,9 +83,16 @@ org.onap.holmes.engine-management,holmes-engine-d,1.0.0
 org.onap.holmes.rule-management,holmes-rulemgt,1.0.0
 org.onap.modeling.toscaparsers,Checker,1.0.0
 org.onap.modeling.toscaparsers,kwalify,1.0.0
+org.onap.modeling.toscaparsers.nfvparser,modeling-toscaparsers-nfvparser,1.0.0
 org.onap.modeling.toscaparsers,Service,1.0.0
 org.onap.msb.java-sdk,msb-java-sdk,1.0.0
 org.onap.msb.swagger-sdk,swagger-sdk,1.0.0
+org.onap.multicloud.framework,multivimbroker,1.0.0
+org.onap.multicloud.openstack,newton,1.0.0
+org.onap.multicloud.openstack,ocata,1.0.0
+org.onap.multicloud.openstack.vmware,vesagent,1.0.0
+org.onap.multicloud.openstack.vmware,vio,1.0.0
+org.onap.multicloud.openstack,windriver,1.0.0
 org.onap.oparent,oparent,0.1.1
 org.onap.policy.common,common-modules,1.1.1
 org.onap.policy.drools-applications,drools-pdp-apps,1.1.1