diff options
38 files changed, 310 insertions, 115 deletions
@@ -48,21 +48,23 @@ The Demo repository contains the HEAT templates and scripts for the instantiatio - vCPE: contains sub-directories with the scripts that install all the components of the vCPE use case. - - VES: source code of the ONAP Vendor Event Listener (VES) Library. The VES library used here has been cloned from the GitHub repository at https://github.com/att/evel-library on February 1, 2017. (DEPRECATED FOR AMSTERDAM RELEASE) + - VES: source code of the ONAP Vendor Event Listener (VES) Library. The VES library used here has been cloned from the GitHub repository at https://github.com/att/evel-library on February 1, 2017. (DEPRECATED SINCE AMSTERDAM RELEASE) - - VESreporting_vFW: VES client for vFirewall demo application. (DEPRECATED FOR AMSTERDAM RELEASE) + - VESreporting_vFW: VES client for vFirewall demo application. (DEPRECATED SINCE AMSTERDAM RELEASE) - - VESreporting_vLB: VES client for vLoadBalancer/vDNS demo application. (DEPRECATED FOR AMSTERDAM RELEASE) + - VESreporting_vLB: VES client for vLoadBalancer/vDNS demo application. (DEPRECATED SINCE AMSTERDAM RELEASE) - - VES5.0: source code of the ONAP Vendor Event Listener (VES) Library, version 5.0. (SUPPORTED FOR AMSTERDAM RELEASE) + - VES5.0: source code of the ONAP Vendor Event Listener (VES) Library, version 5.0. (SUPPORTED FOR AMSTERDAM AND BEIJING RELEASES) - - VESreporting_vFW5.0: VES v5.0 client for vFirewall demo application. (SUPPORTED FOR AMSTERDAM RELEASE) + - VESreporting_vFW5.0: VES v5.0 client for vFirewall demo application. (SUPPORTED FOR AMSTERDAM AND BEIJING RELEASES) - - VESreporting_vLB5.0: VES v5.0 client for vLoadBalancer/vDNS demo application. (SUPPORTED FOR AMSTERDAM RELEASE) + - VESreporting_vLB5.0: VES v5.0 client for vLoadBalancer/vDNS demo application. (SUPPORTED FOR AMSTERDAM AND BEIJING RELEASES) - vFW: scripts that download, install and run packages for the vFirewall use case. - vLB: scripts that download, install and run packages for the vLoadBalancer/vDNS use case. + + - vLBMS: scripts that download, install and run packages for the vLoadBalancer/vDNS used for Manual Scale Out use case. ONAP Installation in OpenStack Clouds via HEAT Template @@ -129,7 +131,6 @@ Some global parameters used for all components are also required: flavor_medium: PUT THE MEDIUM FLAVOR NAME HERE flavor_large: PUT THE LARGE FLAVOR NAME HERE flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE - flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE To get the images in your OpenStack environment, use the following OpenStack CLI command: @@ -146,16 +147,15 @@ Some network parameters must be configured: dns_forwarder: PUT THE IP OF DNS FORWARDER FOR ONAP DEPLOYMENT'S OWN DNS SERVER oam_network_cidr: 10.0.0.0/16 -ONAP installs a DNS server used to resolve IP addresses in the ONAP OAM private network. ONAP Amsterdam Release also requires OpenStack Designate DNS support for the DCAE platform, so as to allow IP address discovery and communication among DCAE elements. This is required because the ONAP HEAT template only installs the DCAE bootstrap container, which will in turn install the entire DCAE platform. As such, at installation time, the IP addresses of the DCAE components are unknown. The DNS server that ONAP installs needs to be connected to the Designate DNS to allow communication between the DCAE elements and the other ONAP components. To this end, dns\_list, external\_dns, and dns\_forwarder should all have the IP address of the Designate DNS. These three parameters are redundant, but still required for Amsterdam Release. Originally, dns\_list and external\_dns were both used to circumvent some limitations of older OpenStack versions. In future releases, the DNS settings and parameters in HEAT will be consolidated. The Designate DNS is configured to access the external DNS. As such, the ONAP DNS will forward to the Designate DNS the queries from ONAP components to the external world. The Designate DNS will then forward those queries to the external DNS. +ONAP installs a DNS server used to resolve IP addresses in the ONAP OAM private network. Unlike Amsterdam Release, ONAP Beijing does not requires OpenStack Designate DNS support for the DCAE platform. For Beijing Release, in fact, all the DCAE containers are installed in a single VM that has access to the OAM network. Originally, dns\_list and external\_dns were both used to circumvent some limitations of older OpenStack versions. In future releases, the DNS settings and parameters in HEAT will be consolidated. -DCAE spins up ONAP's data collection and analytics system in two phases. The first is the launching of a bootstrap VM that is specified in the ONAP Heat template, as described above. This VM requires a number of deployment-specific configuration parameters being provided so that it can subsequently bring up the DCAE system. There are two groups of parameters. The first group relates to the launching of DCAE VMs, including parameters such as the keystone URL and additional VM image IDs/names. Hence these parameters need to be provided to DCAE. Note that although DCAE VMs will be launched in the same tenant as the rest of ONAP, because DCAE may use MultiCloud node as the agent for interfacing with the underlying cloud, it needs a separate keystone URL (which points to MultiCloud node instead of the underlying cloud). The second group of configuration parameters relate to DNS As A Service support (DNSaaS). DCAE requires DNSaaS for registering its VMs into organization-wide DNS service. For OpenStack, DNSaaS is provided by Designate, as mentioned above. Designate support can be provided via an integrated service endpoint listed under the service catalog of the OpenStack installation; or proxyed by the ONAP MultiCloud service. For the latter case, a number of parameters are needed to configure MultiCloud to use the correct Designate service. These parameters are described below: +Due to the new DCAE installation methodology, the following parameters are deprecated and no longer needed for DCAE instantiation: dcae_keystone_url: PUT THE MULTIVIM PROVIDED KEYSTONE API URL HERE dcae_centos_7_image: PUT THE CENTOS7 VM IMAGE NAME HERE FOR DCAE LAUNCHED CENTOS7 VM dcae_domain: PUT THE NAME OF DOMAIN THAT DCAE VMS REGISTER UNDER dcae_public_key: PUT THE PUBLIC KEY OF A KEYPAIR HERE TO BE USED BETWEEN DCAE LAUNCHED VMS dcae_private_key: PUT THE SECRET KEY OF A KEYPAIR HERE TO BE USED BETWEEN DCAE LAUNCHED VMS - dnsaas_config_enabled: PUT WHETHER TO USE PROXYED DESIGNATE dnsaas_region: PUT THE DESIGNATE PROVIDING OPENSTACK'S REGION HERE dnsaas_keystone_url: PUT THE DESIGNATE PROVIDING OPENSTACK'S KEYSTONE URL HERE @@ -163,6 +163,12 @@ DCAE spins up ONAP's data collection and analytics system in two phases. The fi dnsaas_username: PUT THE DESIGNATE PROVIDING OPENSTACK'S USERNAME HERE dnsaas_password: PUT THE DESIGNATE PROVIDING OPENSTACK'S PASSWORD HERE +For Beijing Release, DCAE requires a new parameter called dcae\_deployment\_profile. It accepts one of the following values: + - R2MVP: Installs only the basic DCAE functionalities that will support the vFW/vDNS, vCPE and vVoLTE use cases; + - R2: Full DCAE installation; + - R2PLUS: This profile deploys the DCAE R2 stretch goal service components. + +The recommended DCAE profile for Beijing Release is R2. For more information about DCAE deployment with HEAT, please refer to the ONAP documentation: https://onap.readthedocs.io/en/latest/submodules/dcaegen2.git/docs/sections/installation_heat.html The ONAP platform can be instantiated via Horizon (OpenStack dashboard) or Command Line. @@ -310,6 +316,108 @@ The HEAT environment file contains two parameters: volume\_size is the size (in gigabytes) of the volume group. nova\_instance is the name or UUID of the VM to which the volume group will be attached. This parameter should be changed appropriately. +VNF component Auto Scale Out with Manual Trigger use case via VID and APPC +--- + +The Auto Scale Out with Manual Trigger use case shows how users/network operators can add capacity to an existing VNF. ONAP Beijing release supports scale out of VNF components in two ways, so as to demonstrate flexibility of the ONAP platform and the use case itself. One way involves triggering the scale out operations via the Virtual Infrastructure Deployment (VID) GUI, and uses the Application Controller (APPC) as a generic VNF Manager. This is demonstrated against the vLB/vDNS VNFs. The second example involves triggering scale out operations from the Use case UI (UUI) and uses Virtual Function Controller (VF-C) as generic VNF Manager. This is demonstrated against VoLTE VNFs (MME, SAE-GW, CSCF, TAS). Both scale out blueprints use the Service Orchestrator (SO) as workflow execution engine. + +This repository hosts the source code and scripts that implement the vLB/vDNS VNFs for the scale out blueprint that uses VID, SO, and APPC. At high level, the use case works as follows: + - The user/network operator triggers the scale out operation from the VID portal. VID translates the operation into a call to SO; + - SO instantiates a new VNF component and sends APPC a request for reconfiguring the VNF; + - APPC reconfigures the VNF, without interrupting the service. + +For this use case, we created a modified version of the vLB/vDNS, contained in vnfs/VLBMS. Unlike the vLB/vDNS VNF described before, in this modified version the vLB and the vDNS do not run any automated discovery service. Instead, the vLB has a Northbound API that allows an upstream system (e.g. ONAP) to change the internal configuration by updating the list of active vDNS instances. The Northbound API framework has been built using FD.io-based Honeycomb 1707, and supports both RESTconf and NETCONF protocols. Below is an example of vDNS instances contained in the vLB, in JSON format: + + { + "vlb-business-vnf-onap-plugin": { + "vdns-instances": { + "vdns-instance": [ + { + "ip-addr": "192.168.10.211", + "oam-ip-addr": "10.0.150.2", + "enabled": true + }, + { + "ip-addr": "192.168.10.212", + "oam-ip-addr": "10.0.150.4", + "enabled": true + }] + } + } + } + +According to the flow described above, during an execution of the use case against the vLB/vDNS VNF: + - The user/network operator triggers the instantiation of a new vDNS from the VID GUI; + - VID sends the request to SO, which spins up a new vDNS and sends APPC the details about the new vDNS (i.e. ip-addr, oam-ip-addr, enabled); + - APPC runs a NETCONF operation against the vLB to update the list of vDNS instances with the vDNS just created. + +Although the VNF supports the update of multiple vDNS records in the same call, for Beijing release APPC updates a single vDNS instance at a time. + +The use case includes design-time and run-time operations. For Beijing release, APPC has a new component called Controller Design Tool (CDT), a design-time tool that allows users to create and on-board VNF templates into the APPC. The template describes which control operation can be executed against the VNF (e.g. scale out, health check, modify configuration, etc.), the protocols that the VNF supports, port numbers, VNF APIs, and credentials for authentication. Being VNF agnostic, APPC uses these templates to "learn" about specific VNFs and the supported operations. + +CDT requires two input: 1) the list of parameters that APPC will receive (ip-addr, oam-ip-addr, enabled in the example above); 2) the VNF API that APPC will use to reconfigure the VNF. + +Below is an example of the parameters file (yaml format), which we call parameters.yaml: + + version: V1 + vnf-parameter-list: + - name: ip-addr + type: null + description: null + required: "true" + default: null + source: Manual + rule-type: null + request-keys: null + response-keys: null + - name: oam-ip-addr + type: null + description: null + required: "true" + default: null + source: Manual + rule-type: null + request-keys: null + response-keys: null + - name: enabled + type: null + description: null + required: "true" + default: null + source: Manual + rule-type: null + request-keys: null + response-keys: null + +Here is an example of API for the vLB VNF used for this use case. We name the file after the vnf-type contained in SDNC (i.e. Vloadbalancerms..base_vlb..module-0.xml): + + <vlb-business-vnf-onap-plugin xmlns="urn:opendaylight:params:xml:ns:yang:vlb-business-vnf-onap-plugin"> + <vdns-instances> + <vdns-instance> + <ip-addr>${ip-addr}</ip-addr> + <oam-ip-addr>${oam-ip-addr}</oam-ip-addr> + <enabled>${enabled}</enabled> + </vdns-instance> + </vdns-instances> + </vlb-business-vnf-onap-plugin> + +To create the VNF template in CDT, the following steps are required: + - Connect to the CDT GUI: http://APPC-IP:8080 (in Heat-based ONAP deployments) or http://ANY-K8S-IP:30289 (in OOM/K8S-based ONAP deployments) + - Click "My VNF" Tab. Create your user ID, if necessary + - Click "Create new VNF" entering the VNF type as reported in VID or AAI, e.g. vLoadBalancerMS/vLoadBalancerMS 0 + - Select "ConfigScaleOut" action + - Create a new template identifier using the vnf-type name in SDNC as template name, e.g. Vloadbalancerms..base_vlb..module-0 + - Select protocol (Netconf-XML), VNF username (admin), and VNF port number (2831 for NETCONF) + - Click "Parameter Definition" Tab and upload the parameters (.yaml) file + - Click "Template Tab" and upload API template (.yaml) file + - Click "Reference Data" Tab + - Click "Save All to APPC" + +Finally, log into the APPC controller container and set the VNF password (ConfigScaleOut.password) in /opt/onap/appc/data/properties/appc_southbound.properties to admin. Note that in an ONAP instance created with OOM, APPC may use redundancy to make the controller resilient to failures. For Beijing, CDT only updates one replica of APPC. As such, in a multi-replica environment, the property file should be copied over to the other replicas. If redundancy is used, APPC has 3 replicas. CDT typically updates APPC-0 only, so the property file should be copied over to APPC-1 and APPC-2. This will be addressed in future ONAP releases. + +To trigger the scale out workflow, the user/network operator can log into VID from the ONAP Portal (demo/demo123456! as username/password), select "VNF Changes" and then the "New (+)" button. The user/network operator needs to fill in the "VNF Change Form" by selecting Subscriber, Service Type, NF Role, Model Version, VNF, Scale Out from the Workflow drop down window, and APPC from the Controller drop down window. After clicking "Next", in the following window the user/network operator has to select the VF Module to scale by clicking on the VNF and then on the appropriate VF Module checkbox. Finally, by clicking on the "Schedule" button, the scale out use case will run as described above. + + ONAP Use Cases HEAT Templates --- @@ -342,3 +450,39 @@ Each VNF has a MANIFEST.json file associated with the HEAT templates. During VNF zip ZIP_FILE_NAME.zip * For information about VNF onboarding via the SDC portal, please refer to the wiki page: https://wiki.onap.org/display/DW/Design + +NF Change Management use case +--- + +For the Beijing release, we focused on in-place software upgrades, with vendor-specific details encapsulated in Ansible scripts provided by NF vendors. In-place software upgrades use direct communication between the controller (SDNC or APPC) and the NF instance to trigger the software upgrade, with the upgrade executing on the instance without relinquishing any of the physical resources. Both L1 - L3 and L4+ NFs are supported in the ONAP release via SDN-C and APP-C respectively. +The change management workflow is defined as a composition of building blocks that include locking and unlocking the NF instance, executing health checks, and executing the software upgrade. + + - The CM workflow for the in-place software upgrade is defined and executed by the service orchestrator (SO). + - A&AI is used to lock/unlock the NF instance + - The pre/post health checks and software upgrade execution are implemented in App-C (L4+ NFs) and SDN-C (L1-L3 NFs) by leveraging Ansible services to communicate with the NF instances. + - The user (or, operator) interfaces with the CM workflow using ONAP's VID. SO communicates with A&AI using a REST API and with the controllers SDNC/APPC via DMaaP. + +We setup the use case demonstration for the software upgrade on the virtual gateway (vGW) as part of the vCPE use case in ONAP's Beijing release. +The main script for invoking SO in-place software upgrade workflow is in [demo.git]/vnfs/vCPE/scripts/inPlaceSoftwareUpgrade\_vGW.txt . The workflow can be tested without VID by using this script. +To execute the script, the user/operator would login to the SO container and copy/paste the script. One would have to install vim to edit the script and curl to execute commands within the script: + + - apt-get update + - apt-get install vim + - apt-get install curl + +Check in VID for the available instances - service ID and instance ID - and replace those IDs in the script. Since the use case is for vGW, the controller type is SDNC. + +Next, the user/operator would login to the SDNC container and appropriately configure the Ansible playbooks: + + - Add the ssh key of the vGW on the Ansible server + - Update VNF IP in DG config + -- docker exec -it sdnc_controller_container bash + - Change the following line in /opt/onap/sdnc/data/properties/lcm-dg.properties with IP of VNF: + -- ansible.nodelist=['10.12.5.85'] + - Update VNF IP in Ansible Server + -- docker exec -ti sdnc_ansible_container /bin/bash + -- Add VNF IP in /opt/onap/sdnc/Playbooks/Ansible_inventory + - Update the Playbooks /opt/onap/sdnc/Playbooks + -- ansible_upgradesw@0.00.yml + -- ansible_precheck@0.00.yml + -- ansible_postcheck@0.00.yml diff --git a/boot/oof_vm_init.sh b/boot/oof_vm_init.sh index 7c1f2cc7..fd654430 100644 --- a/boot/oof_vm_init.sh +++ b/boot/oof_vm_init.sh @@ -7,7 +7,10 @@ BUNDLE=/opt/optf-has/AAF_RootCA.cer NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt) NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) -DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) +CASS_MUSIC_IMAGE_VERSION=$(cat /opt/config/cass_version.txt) +MUSIC_IMAGE_VERSION=$(cat /opt/config/music_version.txt) +HAS_IMAGE_VERSION=$(cat /opt/config/has_docker_version.txt) +OSDF_IMAGE_VERSION=$(cat /opt/config/osdf_docker_version.txt) cd /opt/optf-has git pull @@ -18,11 +21,12 @@ LOG_CONF=/opt/optf-has/log.conf #!!! THE FOLLOWING LINE IS A PLACEHOLDER !!! AAI_cert=/usr/local/bin/AAF_RootCA.cer -IMAGE_NAME="$NEXUS_DOCKER_REPO/onap/optf-has" +OSDF_IMG=${NEXUS_DOCKER_REPO}/onap/optf-osdf:${OSDF_IMAGE_VERSION} +HAS_IMG=${NEXUS_DOCKER_REPO}/onap/optf-has:${HAS_IMAGE_VERSION} # MUSIC parameters -CASS_IMG=${NEXUS_DOCKER_REPO}/onap/music/cassandra_music:latest -MUSIC_IMG=${NEXUS_DOCKER_REPO}/onap/music/music:latest +CASS_IMG=${NEXUS_DOCKER_REPO}/onap/music/cassandra_music:$CASS_MUSIC_IMAGE_VERSION +MUSIC_IMG=${NEXUS_DOCKER_REPO}/onap/music/music:$MUSIC_IMAGE_VERSION TOMCAT_IMG=library/tomcat:8.5 ZK_IMG=library/zookeeper:3.4 WORK_DIR=/opt/optf-has @@ -31,17 +35,16 @@ CASS_PASSWORD=cassandra1 # pull images from repo docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO -docker pull $NEXUS_DOCKER_REPO/onap/optf-osdf:$DOCKER_IMAGE_VERSION +docker pull ${OSDF_IMG} docker pull ${ZK_IMG} docker pull ${TOMCAT_IMG} docker pull ${CASS_IMG} docker pull ${MUSIC_IMG} -docker pull $NEXUS_DOCKER_REPO/onap/optf-has:$DOCKER_IMAGE_VERSION +docker pull ${HAS_IMG} #run optf-osdf -OSDF_IMAGE_NAME="$NEXUS_DOCKER_REPO/onap/optf-osdf" OSDF_CONFIG=/opt/optf-osdf/config/osdf_config.yaml HAS_HOST=$(docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' api) @@ -94,7 +97,7 @@ osdfCMSchedulerPassword: testpwd1 NEWFILE -docker run -d --name osdf -v $OSDF_CONFIG:/opt/app/config/osdf_config.yaml -p 8698:8699 ${OSDF_IMAGE_NAME}:latest +docker run -d --name osdf -v $OSDF_CONFIG:/opt/app/config/osdf_config.yaml -p 8698:8699 ${OSDF_IMG} # install MUSIC # create directory for music properties and logs @@ -186,15 +189,15 @@ echo $KEY echo $BUNDLE # run optf-has -docker run -d --name controller -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${IMAGE_NAME}:latest python /usr/local/bin/conductor-controller --config-file=/usr/local/bin/conductor.conf +docker run -d --name controller -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${HAS_IMG} python /usr/local/bin/conductor-controller --config-file=/usr/local/bin/conductor.conf -docker run -d --name api -p "8091:8091" -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${IMAGE_NAME}:latest python /usr/local/bin/conductor-api --port=8091 -- --config-file=/usr/local/bin/conductor.conf +docker run -d --name api -p "8091:8091" -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${HAS_IMG} python /usr/local/bin/conductor-api --port=8091 -- --config-file=/usr/local/bin/conductor.conf -docker run -d --name solver -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${IMAGE_NAME}:latest python /usr/local/bin/conductor-solver --config-file=/usr/local/bin/conductor.conf +docker run -d --name solver -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${HAS_IMG} python /usr/local/bin/conductor-solver --config-file=/usr/local/bin/conductor.conf -docker run -d --name reservation -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${IMAGE_NAME}:latest python /usr/local/bin/conductor-reservation --config-file=/usr/local/bin/conductor.conf +docker run -d --name reservation -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${HAS_IMG} python /usr/local/bin/conductor-reservation --config-file=/usr/local/bin/conductor.conf -docker run -d --name data -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf -v $CERT:/usr/local/bin/aai_cert.cer -v $KEY:/usr/local/bin/aai_key.key -v $BUNDLE:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:latest python /usr/local/bin/conductor-data --config-file=/usr/local/bin/conductor.conf +docker run -d --name data -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf -v $CERT:/usr/local/bin/aai_cert.cer -v $KEY:/usr/local/bin/aai_key.key -v $BUNDLE:/usr/local/bin/AAF_RootCA.cer ${HAS_IMG} python /usr/local/bin/conductor-data --config-file=/usr/local/bin/conductor.conf sleep 10 diff --git a/boot/pom.xml b/boot/pom.xml index 962d0b29..36d66b0b 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.demo.vnf</groupId> <artifactId>demo-aggregator</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/boot/robot_vm_init.sh b/boot/robot_vm_init.sh index ca3a3f16..e306e91f 100644 --- a/boot/robot_vm_init.sh +++ b/boot/robot_vm_init.sh @@ -4,6 +4,7 @@ NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt) NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) +SNIRO_DOCKER_IMAGE_VERSION=$(cat /opt/config/sniro_docker_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) # @@ -48,8 +49,8 @@ docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO docker pull $NEXUS_DOCKER_REPO/onap/testsuite:$DOCKER_IMAGE_VERSION docker rm -f openecompete_container -docker pull $NEXUS_DOCKER_REPO/onap/sniroemulator:latest +docker pull $NEXUS_DOCKER_REPO/onap/sniroemulator:$SNIRO_DOCKER_IMAGE_VERSION docker rm -f sniroemulator docker run -d --name openecompete_container -v /opt/eteshare:/share -p 88:88 $NEXUS_DOCKER_REPO/onap/testsuite:$DOCKER_IMAGE_VERSION -docker run -d --name sniroemulator -p 8080:9999 $NEXUS_DOCKER_REPO/onap/sniroemulator:latest +docker run -d --name sniroemulator -p 8080:9999 $NEXUS_DOCKER_REPO/onap/sniroemulator:$SNIRO_DOCKER_IMAGE_VERSION diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index ccbe63d1..42b0b05c 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -36,7 +36,7 @@ parameters: dmaap_topic: AUTO - artifacts_version: 1.2.1-SNAPSHOT + artifacts_version: 1.2.1 openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE @@ -127,24 +127,27 @@ parameters: appc_docker: 1.3.0 so_docker: 1.2.2 policy_docker: 1.2.3 - portal_docker: v2.2.0 + portal_docker: 2.2.0 robot_docker: 1.2.1 + sniro_docker: 1.0.0 sdc_docker: 1.2.0 sdnc_docker: 1.3.4 vid_docker: 2.0.0 clamp_docker: 2.0.2 msb_docker: 1.1.0 - mvim_docker: 1.1.2-STAGING - mvim_openstack_docker: 1.1.2-SNAPSHOT - uui_docker: latest - esr_docker: latest + mvim_docker: 1.1.2 + mvim_openstack_docker: 1.1.2 + uui_docker: 1.1.1 + esr_docker: 1.1.0 sdc_wfd_docker: 1.1.0 dgbuilder_docker: 0.2.4 cli_docker: 2.0.2 - music_docker: latest - oof_docker: 1.1.1 + music_docker: 2.5.3 + cassandra_music_docker: 3.0.0 + optf_has_docker: 1.1.1 + optf_osdf_docker: 1.1.1 aaf_docker: 2.1.1 - sms_docker: latest + sms_docker: 2.0.0 nbi_docker: 2.0.0 dbcl_docker: 1.0.12 @@ -162,8 +165,6 @@ parameters: dcae_inv_docker: 3.0.1 dcae_ph_docker: 2.4.5 dcae_sch_docker: 1.1.4 - dcae_heartbeat_docker: latest - dcae_prh_docker: latest holmes_rm_docker: 1.1.0 holmes_em_docker: 1.1.0 diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 92f119ea..98848c4f 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -410,6 +410,8 @@ parameters: type: string robot_docker: type: string + sniro_docker: + type: string sdc_docker: type: string sdc_wfd_docker: @@ -436,7 +438,11 @@ parameters: type: string music_docker: type: string - oof_docker: + cassandra_music_docker: + type: string + optf_has_docker: + type: string + optf_osdf_docker: type: string aaf_docker: type: string @@ -1086,6 +1092,7 @@ resources: __script_version__: { get_param: artifacts_version } __robot_repo__: { get_param: robot_repo } __docker_version__: { get_param: robot_docker } + __sniro_docker_version__: { get_param: sniro_docker } __vnf_pub_key__: { get_param: pub_key } __use_oam_net_for_robot__: { get_param: use_oam_net_for_robot } template: | @@ -1104,6 +1111,7 @@ resources: echo "__openstack_region__" > /opt/config/region.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__docker_version__" > /opt/config/docker_version.txt + echo "__sniro_docker_version__" > /opt/config/sniro_docker_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__keystone_url__" > /opt/config/keystone.txt @@ -2160,7 +2168,10 @@ resources: __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: oof_docker } + __has_docker_version__: { get_param: optf_has_docker } + __osdf_docker_version__: { get_param: optf_osdf_docker } + __music_docker_version__: { get_param: music_docker } + __cass_music_docker_version__: { get_param: cassandra_music_docker } __oof_repo__: { get_param: oof_repo } __gerrit_branch__: { get_param: oof_branch } __cloud_env__: { get_param: cloud_env } @@ -2176,7 +2187,10 @@ resources: echo "__nexus_password__" > /opt/config/nexus_password.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt - echo "__docker_version__" > /opt/config/docker_version.txt + echo "__has_docker_version__" > /opt/config/has_docker_version.txt + echo "__osdf_docker_version__" > /opt/config/osdf_docker_version.txt + echo "__music_docker_version__" > /opt/config/music_version.txt + echo "__cass_music_docker_version__" > /opt/config/cass_version.txt echo "__oof_repo__" > /opt/config/remote_repo.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env index 6238bc2c..c6a93813 100644 --- a/heat/ONAP/onap_openstack_template.env +++ b/heat/ONAP/onap_openstack_template.env @@ -36,7 +36,7 @@ parameters: dmaap_topic: AUTO - artifacts_version: 1.2.1-SNAPSHOT + artifacts_version: 1.2.1 openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE @@ -129,6 +129,7 @@ parameters: policy_docker: ${POLICY_PE_DOCKER} portal_docker: ${PORTAL_APP_DOCKER} robot_docker: ${TESTSUITE_DOCKER} + sniro_docker: ${SNIROEMULATOR_DOCKER} sdc_docker: ${SDC_BACKEND_DOCKER} sdnc_docker: ${SDNC_IMAGE_DOCKER} vid_docker: ${VID_DOCKER} @@ -142,7 +143,9 @@ parameters: dgbuilder_docker: ${CCSDK_DGBUILDER_IMAGE_DOCKER} cli_docker: ${CLI_DOCKER} music_docker: ${MUSIC_DOCKER} - oof_docker: ${OPTF_OSDF_DOCKER} + cassandra_music_docker: ${CASSANDRA_MUSIC_DOCKER} + optf_has_docker: ${OPTF_HAS_DOCKER} + optf_osdf_docker: ${OPTF_OSDF_DOCKER} aaf_docker: ${AAF_SERVICE_DOCKER} sms_docker: ${SMS_DOCKER} nbi_docker: ${NBI_DOCKER} @@ -162,8 +165,6 @@ parameters: dcae_inv_docker: ${INVENTORY_API_DOCKER} dcae_ph_docker: ${POLICY_HANDLER_DOCKER} dcae_sch_docker: ${SERVICECHANGE_HANDLER_DOCKER} - dcae_heartbeat_docker: ${HEARTBEAT_DOCKER} - dcae_prh_docker: ${PRH_APP_SERVER_DOCKER} holmes_rm_docker: ${RULE_MANAGEMENT_DOCKER} holmes_em_docker: ${ENGINE_MANAGEMENT_DOCKER} diff --git a/heat/vCPE/infra/base_vcpe_infra.env b/heat/vCPE/infra/base_vcpe_infra.env index 71454ffb..dafe72f1 100644 --- a/heat/vCPE/infra/base_vcpe_infra.env +++ b/heat/vCPE/infra/base_vcpe_infra.env @@ -30,9 +30,9 @@ parameters: dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 repo_url_blob: https://nexus.onap.org/content/sites/raw - repo_url_artifacts: https://nexus.onap.org/content/groups/staging - demo_artifacts_version: 1.2.0 - install_script_version: 1.2.0-SNAPSHOT + repo_url_artifacts: https://nexus.onap.org/content/repositories/releases + demo_artifacts_version: 1.2.1 + install_script_version: 1.2.1 key_name: vaaa_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace) diff --git a/heat/vCPE/vbng/base_vcpe_vbng.env b/heat/vCPE/vbng/base_vcpe_vbng.env index 97f5ac9d..0495cf0e 100644 --- a/heat/vCPE/vbng/base_vcpe_vbng.env +++ b/heat/vCPE/vbng/base_vcpe_vbng.env @@ -25,9 +25,9 @@ dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 repo_url_blob: https://nexus.onap.org/content/sites/raw - repo_url_artifacts: https://nexus.onap.org/content/groups/staging - demo_artifacts_version: 1.2.0 - install_script_version: 1.2.0-SNAPSHOT + repo_url_artifacts: https://nexus.onap.org/content/repositories/releases + demo_artifacts_version: 1.2.1 + install_script_version: 1.2.1 key_name: vbng_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace) diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env index da97c392..272f23c2 100644 --- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env +++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env @@ -15,9 +15,9 @@ vnf_id: vCPE_Infrastructure_BGREMU_demo_app vf_module_id: vCPE_Customer_BRGEMU repo_url_blob: https://nexus.onap.org/content/sites/raw - repo_url_artifacts: https://nexus.onap.org/content/groups/staging - demo_artifacts_version: 1.2.0 - install_script_version: 1.2.0-SNAPSHOT + repo_url_artifacts: https://nexus.onap.org/content/repositories/releases + demo_artifacts_version: 1.2.1 + install_script_version: 1.2.1 key_name: vbrgemu_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace) diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.env b/heat/vCPE/vgmux/base_vcpe_vgmux.env index a76fde6e..9e557ada 100644 --- a/heat/vCPE/vgmux/base_vcpe_vgmux.env +++ b/heat/vCPE/vgmux/base_vcpe_vgmux.env @@ -22,9 +22,9 @@ dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 repo_url_blob: https://nexus.onap.org/content/sites/raw - repo_url_artifacts: https://nexus.onap.org/content/groups/staging - demo_artifacts_version: 1.2.0 - install_script_version: 1.2.0-SNAPSHOT + repo_url_artifacts: https://nexus.onap.org/content/repositories/releases + demo_artifacts_version: 1.2.1 + install_script_version: 1.2.1 key_name: vgmux_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace) diff --git a/heat/vCPE/vgw/base_vcpe_vgw.env b/heat/vCPE/vgw/base_vcpe_vgw.env index d2f67a91..c6e20541 100644 --- a/heat/vCPE/vgw/base_vcpe_vgw.env +++ b/heat/vCPE/vgw/base_vcpe_vgw.env @@ -22,9 +22,9 @@ dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 repo_url_blob: https://nexus.onap.org/content/sites/raw - repo_url_artifacts: https://nexus.onap.org/content/groups/staging - demo_artifacts_version: 1.2.0 - install_script_version: 1.2.0-SNAPSHOT + repo_url_artifacts: https://nexus.onap.org/content/repositories/releases + demo_artifacts_version: 1.2.1 + install_script_version: 1.2.1 key_name: vgw_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace) diff --git a/heat/vFW/base_vfw.env b/heat/vFW/base_vfw.env index c6591ef1..7f031f63 100644 --- a/heat/vFW/base_vfw.env +++ b/heat/vFW/base_vfw.env @@ -24,9 +24,9 @@ parameters: dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 repo_url_blob: https://nexus.onap.org/content/sites/raw - repo_url_artifacts: https://nexus.onap.org/content/groups/staging - demo_artifacts_version: 1.2.0 - install_script_version: 1.2.0-SNAPSHOT + repo_url_artifacts: https://nexus.onap.org/content/repositories/releases + demo_artifacts_version: 1.2.1 + install_script_version: 1.2.1 key_name: vfw_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: PUT openstack OR rackspace HERE diff --git a/heat/vFWCL/vFWSNK/base_vfw.env b/heat/vFWCL/vFWSNK/base_vfw.env index aec1660e..a6c4c738 100644 --- a/heat/vFWCL/vFWSNK/base_vfw.env +++ b/heat/vFWCL/vFWSNK/base_vfw.env @@ -24,9 +24,9 @@ parameters: dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 repo_url_blob: https://nexus.onap.org/content/sites/raw - repo_url_artifacts: https://nexus.onap.org/content/groups/staging - demo_artifacts_version: 1.2.0 - install_script_version: 1.2.0-SNAPSHOT + repo_url_artifacts: https://nexus.onap.org/content/repositories/releases + demo_artifacts_version: 1.2.1 + install_script_version: 1.2.1 key_name: vfw_key pub_key: PUT YOUR KEY HERE cloud_env: PUT openstack OR rackspace HERE diff --git a/heat/vFWCL/vPKG/base_vpkg.env b/heat/vFWCL/vPKG/base_vpkg.env index ff8d4626..317fde9e 100644 --- a/heat/vFWCL/vPKG/base_vpkg.env +++ b/heat/vFWCL/vPKG/base_vpkg.env @@ -17,9 +17,9 @@ parameters: vnf_id: vPNG_Firewall_demo_app vf_module_id: vTrafficPNG repo_url_blob: https://nexus.onap.org/content/sites/raw - repo_url_artifacts: https://nexus.onap.org/content/groups/staging - demo_artifacts_version: 1.2.0 - install_script_version: 1.2.0-SNAPSHOT + repo_url_artifacts: https://nexus.onap.org/content/repositories/releases + demo_artifacts_version: 1.2.1 + install_script_version: 1.2.1 key_name: vfw_key pub_key: PUT YOUR PUBLIC KEY HERE cloud_env: PUT openstack OR rackspace HERE diff --git a/heat/vLB/base_vlb.env b/heat/vLB/base_vlb.env index c0a8334a..78cc994d 100644 --- a/heat/vLB/base_vlb.env +++ b/heat/vLB/base_vlb.env @@ -27,9 +27,9 @@ parameters: dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 repo_url_blob: https://nexus.onap.org/content/sites/raw - repo_url_artifacts: https://nexus.onap.org/content/groups/staging - demo_artifacts_version: 1.2.0 - install_script_version: 1.2.0-SNAPSHOT + repo_url_artifacts: https://nexus.onap.org/content/repositories/releases + demo_artifacts_version: 1.2.1 + install_script_version: 1.2.1 key_name: vlb_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: PUT openstack OR backspace HERE diff --git a/heat/vLB/dnsscaling.env b/heat/vLB/dnsscaling.env index 21983747..2196337b 100644 --- a/heat/vLB/dnsscaling.env +++ b/heat/vLB/dnsscaling.env @@ -15,9 +15,9 @@ parameters: vnf_id: vLoadBalancer_demo_app vf_module_id: vLoadBalancer repo_url_blob: https://nexus.onap.org/content/sites/raw - repo_url_artifacts: https://nexus.onap.org/content/groups/staging - demo_artifacts_version: 1.2.0 - install_script_version: 1.2.0-SNAPSHOT + repo_url_artifacts: https://nexus.onap.org/content/repositories/releases + demo_artifacts_version: 1.2.1 + install_script_version: 1.2.1 key_name: vlb_key_scaling pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: PUT openstack OR backspace HERE
\ No newline at end of file diff --git a/heat/vLBMS/base_vlb.env b/heat/vLBMS/base_vlb.env index c0a8334a..3454fa43 100644 --- a/heat/vLBMS/base_vlb.env +++ b/heat/vLBMS/base_vlb.env @@ -27,9 +27,9 @@ parameters: dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 repo_url_blob: https://nexus.onap.org/content/sites/raw - repo_url_artifacts: https://nexus.onap.org/content/groups/staging + repo_url_artifacts: https://nexus.onap.org/content/repositories/releases demo_artifacts_version: 1.2.0 - install_script_version: 1.2.0-SNAPSHOT + install_script_version: 1.2.1 key_name: vlb_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: PUT openstack OR backspace HERE diff --git a/heat/vLBMS/dnsscaling.env b/heat/vLBMS/dnsscaling.env index 3fa627d5..d40bf96f 100644 --- a/heat/vLBMS/dnsscaling.env +++ b/heat/vLBMS/dnsscaling.env @@ -16,9 +16,9 @@ parameters: vnf_id: vLoadBalancer_demo_app vf_module_id: vLoadBalancer repo_url_blob: https://nexus.onap.org/content/sites/raw - repo_url_artifacts: https://nexus.onap.org/content/groups/staging + repo_url_artifacts: https://nexus.onap.org/content/repositories/releases demo_artifacts_version: 1.2.0 - install_script_version: 1.2.0-SNAPSHOT + install_script_version: 1.2.1 key_name: vlb_key_scaling pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: PUT openstack OR backspace HERE
\ No newline at end of file @@ -27,7 +27,7 @@ <groupId>org.onap.demo.vnf</groupId> <artifactId>demo-aggregator</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <name>demo</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> @@ -82,24 +82,6 @@ </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.1.1</version> - <executions> - <execution> - <id>upload-boot-scripts</id> - <phase>deploy</phase> - <goals> - <goal>exec</goal> - </goals> - </execution> - </executions> - <configuration> - <executable>scripts/deploy.sh</executable> - </configuration> - </plugin> - - <plugin> <groupId>org.sonatype.plugins</groupId> <artifactId>nexus-staging-maven-plugin</artifactId> <version>1.6.7</version> diff --git a/version.properties b/version.properties index a32a56d9..1ecbc20a 100644 --- a/version.properties +++ b/version.properties @@ -2,8 +2,8 @@ # because they are used in Jenkins, whose plug-in doesn't support major=1 -minor=2 -patch=1 +minor=3 +patch=0 base_version=${major}.${minor}.${patch} diff --git a/vnfs/VES/pom.xml b/vnfs/VES/pom.xml index fc3f90bd..f3c1cd2c 100644 --- a/vnfs/VES/pom.xml +++ b/vnfs/VES/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.demo.vnf</groupId> <artifactId>demo-aggregator</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/vnfs/VES5.0/pom.xml b/vnfs/VES5.0/pom.xml index 4b150e9c..79d99e9a 100644 --- a/vnfs/VES5.0/pom.xml +++ b/vnfs/VES5.0/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.demo.vnf</groupId> <artifactId>demo-aggregator</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/vnfs/VESreporting_vFW/pom.xml b/vnfs/VESreporting_vFW/pom.xml index 113319bf..d46fac10 100644 --- a/vnfs/VESreporting_vFW/pom.xml +++ b/vnfs/VESreporting_vFW/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.demo.vnf</groupId> <artifactId>demo-aggregator</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/vnfs/VESreporting_vFW5.0/pom.xml b/vnfs/VESreporting_vFW5.0/pom.xml index 216ad3a5..9630b415 100644 --- a/vnfs/VESreporting_vFW5.0/pom.xml +++ b/vnfs/VESreporting_vFW5.0/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.demo.vnf</groupId> <artifactId>demo-aggregator</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/vnfs/VESreporting_vLB/pom.xml b/vnfs/VESreporting_vLB/pom.xml index d9ffd0d8..cca13ad2 100644 --- a/vnfs/VESreporting_vLB/pom.xml +++ b/vnfs/VESreporting_vLB/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.demo.vnf</groupId> <artifactId>demo-aggregator</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/vnfs/VESreporting_vLB5.0/pom.xml b/vnfs/VESreporting_vLB5.0/pom.xml index cd2f77d2..22c1659c 100644 --- a/vnfs/VESreporting_vLB5.0/pom.xml +++ b/vnfs/VESreporting_vLB5.0/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.demo.vnf</groupId> <artifactId>demo-aggregator</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml index c561dcae..1c7e8a24 100644 --- a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml +++ b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.demo.vnf</groupId> <artifactId>demo-aggregator</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml index 3bfe58bc..ee901a44 100755 --- a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml +++ b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.onap.demo.vnf</groupId> <artifactId>hc-onap</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <relativePath>../parent-pom/pom.xml</relativePath> </parent> diff --git a/vnfs/vCPE/kea-sdnc-notify-mod/pom.xml b/vnfs/vCPE/kea-sdnc-notify-mod/pom.xml index ea86f7ba..8c3d452f 100644 --- a/vnfs/vCPE/kea-sdnc-notify-mod/pom.xml +++ b/vnfs/vCPE/kea-sdnc-notify-mod/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.demo.vnf</groupId> <artifactId>demo-aggregator</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/vnfs/vCPE/scripts/inPlaceSoftwareUpgrade_vGW.sh b/vnfs/vCPE/scripts/inPlaceSoftwareUpgrade_vGW.sh new file mode 100644 index 00000000..6b71b533 --- /dev/null +++ b/vnfs/vCPE/scripts/inPlaceSoftwareUpgrade_vGW.sh @@ -0,0 +1,49 @@ +root@onap-so:~# cat /root/inPlaceSoftwareUpgrade_vGW.sh +#!/bin/bash + +tmp=/tmp/send$$ +trap "rm -f $tmp.*; exit 1" 0 1 2 15 + +user="InfraPortalClient:password1$" +serviceInstance="a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb" +vnf="1ae8197f-8496-41e1-9695-dce9fd77315a" +apiVer=v6 + +url="http://localhost:8080/ecomp/mso/infra/serviceInstances/$apiVer/$serviceInstance/vnfs/$vnf/inPlaceSoftwareUpdate" + +( +cat << 'XEOF' +{ + "requestDetails": { + "requestInfo": { + "source": "VID", + "suppressRollback": false, + "requestorId": "ek1439" + }, + "cloudConfiguration": { + "tenantId": "d570c718cbc545029f40e50b75eb13df", + "lcpCloudRegionId": "RegionOne" + }, + "requestParameters": { + "payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}", + "controllerType": "sdnc" + } + }, + "serviceInstanceId": "$serviceInstance", + "vnfInstanceId": "$vnf" +} + +XEOF +) > $tmp.content || exit 1 + +# Enabling debug logging for API-Handler-Infra . . . +curl -o /dev/null -w '%{http_code}' --user 'MSOClient:password1$' 'http://mso:8080/ecomp/mso/infra/logging/debug?enable=true' + +# Enabling debug logging for BPMN . . . +curl -o /dev/null -w '%{http_code}' 'http://mso:8080/mso/logging/debug?enable=true' + +# Enabling debug logging for SDNC-Adapter . . . +curl -o /dev/null -w '%{http_code}' --user 'MSOClient:password1$' 'http://mso:8080/adapters/rest/logging/debug?enable=true' + +# Send the request +curl -v -X POST -d @$tmp.content --user "$user" "$url" --header "Content-Type:application/json" diff --git a/vnfs/vFW/pg_streams/pom.xml b/vnfs/vFW/pg_streams/pom.xml index b6fd63ea..08813883 100644 --- a/vnfs/vFW/pg_streams/pom.xml +++ b/vnfs/vFW/pg_streams/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.demo.vnf</groupId> <artifactId>demo-aggregator</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/vnfs/vLB/DNSClient/pom.xml b/vnfs/vLB/DNSClient/pom.xml index fe2eec10..8f083eb8 100644 --- a/vnfs/vLB/DNSClient/pom.xml +++ b/vnfs/vLB/DNSClient/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.demo.vnf</groupId> <artifactId>demo-aggregator</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/vnfs/vLB/DNSManager/pom.xml b/vnfs/vLB/DNSManager/pom.xml index 3cace651..609a7896 100644 --- a/vnfs/vLB/DNSManager/pom.xml +++ b/vnfs/vLB/DNSManager/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.demo.vnf</groupId> <artifactId>demo-aggregator</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/vnfs/vLB/dns_streams/pom.xml b/vnfs/vLB/dns_streams/pom.xml index fee77924..5d2f56db 100644 --- a/vnfs/vLB/dns_streams/pom.xml +++ b/vnfs/vLB/dns_streams/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.demo.vnf</groupId> <artifactId>demo-aggregator</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/vnfs/vLBMS/scripts/v_dns_install.sh b/vnfs/vLBMS/scripts/v_dns_install.sh index f4c9fbce..ae56a9b8 100644 --- a/vnfs/vLBMS/scripts/v_dns_install.sh +++ b/vnfs/vLBMS/scripts/v_dns_install.sh @@ -69,7 +69,7 @@ cd honeycomb-api git remote add origin https://gerrit.onap.org/r/p/demo.git git config core.sparsecheckout true echo "vnfs/vLBMS/apis" >> .git/info/sparse-checkout -git pull --depth=1 origin master +git pull --depth=1 origin beijing mkdir ~/.m2 cat > ~/.m2/settings.xml << EOF diff --git a/vnfs/vLBMS/scripts/v_lb_install.sh b/vnfs/vLBMS/scripts/v_lb_install.sh index 50678c7c..e81bf10f 100644 --- a/vnfs/vLBMS/scripts/v_lb_install.sh +++ b/vnfs/vLBMS/scripts/v_lb_install.sh @@ -84,7 +84,7 @@ cd honeycomb-api git remote add origin https://gerrit.onap.org/r/p/demo.git git config core.sparsecheckout true echo "vnfs/vLBMS/apis" >> .git/info/sparse-checkout -git pull --depth=1 origin master +git pull --depth=1 origin beijing mkdir ~/.m2 cat > ~/.m2/settings.xml << EOF diff --git a/vnfs/vLBMS/scripts/v_packetgen_install.sh b/vnfs/vLBMS/scripts/v_packetgen_install.sh index 4127822e..e4b4cbf6 100644 --- a/vnfs/vLBMS/scripts/v_packetgen_install.sh +++ b/vnfs/vLBMS/scripts/v_packetgen_install.sh @@ -73,7 +73,7 @@ cd honeycomb-api git remote add origin https://gerrit.onap.org/r/p/demo.git git config core.sparsecheckout true echo "vnfs/vLBMS/apis" >> .git/info/sparse-checkout -git pull --depth=1 origin master +git pull --depth=1 origin beijing mkdir ~/.m2 cat > ~/.m2/settings.xml << EOF |