diff options
28 files changed, 1002 insertions, 193 deletions
diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env index 04fa44d76..42726e5b7 100644 --- a/deployment/heat/onap-oom/env/tlab/onap-oom.env +++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env @@ -6,7 +6,7 @@ parameters: docker_proxy: 192.168.31.204:5000 rancher_vm_flavor: m1.large - k8s_vm_flavor: m1.xlarge + k8s_vm_flavor: m4.xlarge etcd_vm_flavor: m1.medium orch_vm_flavor: m1.medium @@ -14,6 +14,8 @@ parameters: oam_network_cidr: 10.0.0.0/16 + integration_gerrit_branch: master + helm_deploy_delay: 4m integration_override_yaml: > @@ -36,8 +38,9 @@ parameters: openStackOamNetworkCidrPrefix: "10.0" dcaeCollectorIp: "__k8s_01_vm_ip__" vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" - demoArtifactsVersion: "1.3.0-SNAPSHOT" - scriptVersion: "1.3.0-SNAPSHOT" + demoArtifactsVersion: "1.3.0" + demoArtifactsRepoUrl: "https://nexus.onap.org/content/repositories/releases" + scriptVersion: "1.3.0" rancherIpAddress: "__rancher_ip_addr__" config: openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" @@ -62,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 15819ffe1..6d471ffa2 100644 --- a/deployment/heat/onap-oom/env/windriver/onap-oom.env +++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env @@ -14,6 +14,8 @@ parameters: oam_network_cidr: 10.0.0.0/16 + integration_gerrit_branch: master + helm_deploy_delay: 2.5m integration_override_yaml: > @@ -37,8 +39,9 @@ parameters: openStackOamNetworkCidrPrefix: "10.0" dcaeCollectorIp: "__k8s_01_vm_ip__" vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" - demoArtifactsVersion: "1.3.0-SNAPSHOT" - scriptVersion: "1.3.0-SNAPSHOT" + demoArtifactsVersion: "1.3.0" + demoArtifactsRepoUrl: "https://nexus.onap.org/content/repositories/releases" + scriptVersion: "1.3.0" rancherIpAddress: "__rancher_ip_addr__" config: openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" @@ -63,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/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml index e6845cc52..44b23e4e7 100644 --- a/deployment/heat/onap-oom/onap-oom.yaml +++ b/deployment/heat/onap-oom/onap-oom.yaml @@ -49,7 +49,7 @@ parameters: integration_gerrit_refspec: type: string - default: "refs/heads/master" + default: "" oom_gerrit_branch: type: string @@ -57,7 +57,7 @@ parameters: oom_gerrit_refspec: type: string - default: "refs/heads/master" + default: "" docker_manifest: type: string diff --git a/deployment/heat/onap-oom/parts/onap-oom-1.yaml b/deployment/heat/onap-oom/parts/onap-oom-1.yaml index 5f117acb8..1a9e33d60 100644 --- a/deployment/heat/onap-oom/parts/onap-oom-1.yaml +++ b/deployment/heat/onap-oom/parts/onap-oom-1.yaml @@ -46,7 +46,7 @@ parameters: integration_gerrit_refspec: type: string - default: "refs/heads/master" + default: "" oom_gerrit_branch: type: string @@ -54,7 +54,7 @@ parameters: oom_gerrit_refspec: type: string - default: "refs/heads/master" + default: "" docker_manifest: type: string diff --git a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh index bd39963de..1ee29b011 100644 --- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh +++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh @@ -270,8 +270,10 @@ git config --global log.decorate auto cd ~ git clone -b __oom_gerrit_branch__ https://gerrit.onap.org/r/oom cd oom -git fetch https://gerrit.onap.org/r/oom __oom_gerrit_refspec__ -git checkout FETCH_HEAD +if [ ! -z "__oom_gerrit_refspec__" ]; then + git fetch https://gerrit.onap.org/r/oom __oom_gerrit_refspec__ + git checkout FETCH_HEAD +fi git checkout -b workarounds git log -1 @@ -279,8 +281,10 @@ git log -1 cd ~ git clone -b __integration_gerrit_branch__ https://gerrit.onap.org/r/integration cd integration -git fetch https://gerrit.onap.org/r/integration __integration_gerrit_refspec__ -git checkout FETCH_HEAD +if [ ! -z "__integration_gerrit_refspec__" ]; then + git fetch https://gerrit.onap.org/r/integration __integration_gerrit_refspec__ + git checkout FETCH_HEAD +fi if [ ! -z "__docker_manifest__" ]; then diff --git a/docs/docs_scaleout.rst b/docs/docs_scaleout.rst new file mode 100644 index 000000000..184bee29d --- /dev/null +++ b/docs/docs_scaleout.rst @@ -0,0 +1,204 @@ +VF Module Scale Out Use Case +---------------------------- + +Source files +~~~~~~~~~~~~ + +- Base VNF template file: https://git.onap.org/demo/plain/heat/vLBMS/base_vlb.yaml +- Base VNF environment file: https://git.onap.org/demo/plain/heat/vLBMS/base_vlb.env + +- VF module scaling template file: https://git.onap.org/demo/plain/heat/vLBMS/dnsscaling.yaml +- VF module scaling environment file: https://git.onap.org/demo/plain/heat/vLBMS/dnsscaling.env + +Description +~~~~~~~~~~~ +The Scale Out use case shows how users/network operators can add Virtual Network Function Components (VNFCs) as part of a VF Module that has been instantiated in the Service model to an existing VNF, in order to increase capacity of the network. ONAP Casablanca release supports scale out with manual trigger from VID and closed-loop enabled automation from Policy. This is demonstrated against the vLB/vDNS VNFs developed for ONAP. For Casablanca, both APPC and SDNC controllers are used to demonstrate accepting request from SO to execute the Scale Out operation. APPC is the main controller used for this use case and it can be used to scale different VNF types. SDNC is experimental for now and it can scale only the vDNS VNF developed for ONAP. + +The Casablanca Scaling Use Case Wiki Page can be found here: https://wiki.onap.org/display/DW/Scaling+Use+Case+Extension + +How to Use +~~~~~~~~~~ +Scaling VF modules manually requires the user/network operator to trigger the scale out operation from the VID portal. VID translates the operation into a call to SO. Scaling VF modules in an automated manner instead requires the user/network operator to design and deploy a closed loop for scale out that includes policies (e.g. threshold-crossing conditions), guard policies that determine when it's safe to scale out, and microservices that analyze events coming from the network in order to discover situations. + +Both manual and automated scale out activate the scale out workflow in the Service Orchestrator (SO). The workflow runs as follows: + +- SO sends a request to APPC to run health check against the VNF; +- If the VNF is healthy, SO instantiates a new VF module and sends a request to APPC to reconfigure the VNF; +- APPC reconfigures the VNF, without interrupting the service; +- SO sends a request to APPC to run health check against the VNF again, to validate that the scale out operation didn't impact the running VNF. + +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 (i.e. VNF reconfiguration). 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 + } + ] + } + } + } + +The parameters required for VNF reconfiguration (i.e. "ip-addr", "oam-ip-addr", and "enabled" in case of vLB/vDNS) can be specified in the VID GUI when triggering the workflow manually or in CLAMP when designing a closed loop for the automated case. In both cases, the format used for specifying the parameters and their values is a JSON path. SO will use the provided paths to access parameters' name and value in the VF module preload received from SDNC before instantiating a new VF module. + +VID accepts a JSON array in the "Configuration Parameter" box (see later), for example: +:: + +[{"ip-addr":"$.vf-module-topology.vf-module-parameters.param[10].value","oam-ip-addr":"$.vf-module-topology.vf-module-parameters.param[15].value","enabled":"$.vf-module-topology.vf-module-parameters.param[22].value"}] + +CLAMP, instead, accepts a YAML file in the "Payload" box in the Policy Creation form, for example: +:: + + requestParameters: '{"usePreload":true,"userParams":[]}' + configurationParameters: '[{"ip-addr":"$.vf-module-topology.vf-module-parameters.param[10].value","oam-ip-addr":"$.vf-module-topology.vf-module-parameters.param[15].value","enabled":"$.vf-module-topology.vf-module-parameters.param[22].value"}]' + +Note that Policy requires an additional object, called "requestParameters" in which "usePreload" should be set to true and the "userParams" array should be left empty. + +The JSON path to the parameters used for VNF reconfiguration, including array locations, should be set as described above. Finally, although the VNF supports to update multiple vDNS records in the same call, for Casablanca release APPC updates a single vDNS instance at a time. + +When using APPC, before running scale out, the user needs to create a VNF template using the 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..dnsscaling..module-1): +:: + + <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..dnsscaling..module-1 +- 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" + +For health check operation, we just need to specify the protocol, the port number and username of the VNF (REST, 8183, and "admin" respectively, in the case of vLB/vDNS) and the API. For the vLB/vDNS, the API is: +:: + + restconf/operational/health-vnf-onap-plugin:health-vnf-onap-plugin-state/health-check + +Note that we don't need to create a VNF template for health check, so the "Template" flag can be set to "N". Again, the user has to click "Save All to APPC" to update the APPC database. +At this time, CDT doesn't allow users to provide VNF password from the GUI. To update the VNF password we need to log into the APPC Maria DB container and change the password manually: +:: + + mysql -u sdnctl -p (type "gamma" when password is prompted) + use sdnctl; + UPDATE DEVICE_AUTHENTICATION SET PASSWORD='admin' WHERE + VNF_TYPE='vLoadBalancerMS/vLoadBalancerMS 0'; (use your VNF type) + +To trigger the scale out workflow manually, 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 dropdown window, and insert the JSON path array described above in the "Configuration Parameter" box. 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. + +Automated scale out requires the user to onboard a DCAE blueprint in SDC when creating the service. To design a closed loop for scale out, the user needs to access the CLAMP GUI (https://clamp.api.simpledemo.onap.org:30258/designer/index.html) and execute the following operations: + +- Click the "Closed loop" dropdown window and select "Open CL" +- Select the closed loop model and click "OK" +- In the next screen, click the "Policy" box to create a policy for closed loop, including guard policies +- After creating the policies, click "TCA" and review the blueprint uploaded during service creation and distributed by SDC to CLAMP +- Click the "Manage" dropdown and then "Submit" to push the policies to the Policy Engine +- From the same "Manage" dropdown, click "Deploy" to deploy the TCA blueprint to DCAE + +The vLB/vDNS VNF generates traffic and reports metrics to the VES collector in the DCAE platform. The number of incoming packets to the vLB is used to evaluate the policy defined for closed loop. If the provided threshold is crossed, DCAE generates an event that reaches the Policy Engine, which in turn activates the scale out closed loop described above. + +For more information about scale out, videos, and material used for running the use case, please look at the wiki page: https://wiki.onap.org/display/DW/Running+Scale+Out+Use+Case+for+Casablanca + +Test Status and Plans +~~~~~~~~~~~~~~~~~~~~~ +Casablanca Scale Out completed all tests as found here: https://wiki.onap.org/pages/viewpage.action?pageId=36964241#UseCaseTracking(CasablancaScaling)-Testing + +Known Issues and Resolutions +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +1) When running closed loop-enabled scale out, the closed loop designed in CLAMP conflicts with the default closed loop defined for the old vLB/vDNS use case + +Resolution: Change TCA configuration for the old vLB/vDNS use case + +- Connect to Consul: http://<ANY K8S VM IP ADDRESS>:30270 and click on "Key/Value" → "dcae-tca-analytics" +- Change "eventName" in the vLB default policy to something different, for example "vLB" instead of the default value "vLoadBalancer" +- Change "subscriberConsumerGroup" in the TCA configuration to something different, for example "OpenDCAE-c13" instead of the default value "OpenDCAE-c12" +- Click "UPDATE" to upload the new TCA configuration + +2) When running closed loop-enabled scale out, the permitAll guard policy conflicts with the scale out guard policy + +Resolution: Undeploy the permitAll guard policy + +- Connect to the Policy GUI, either through the ONAP Portal (https://portal.api.simpledemo.onap.org:30225/ONAPPORTAL/login.htm) or directly (https://policy.api.simpledemo.onap.org:30219/onap/login.htm) +- If using the ONAP Portal, use demo/demo123456! as credentials, otherwise, if accessing Policy GUI directly, use demo/demo +- Click "Policy" → "Push" on the left panel +- Click the pencil symbol next to "default" in the PDP Groups table +- Select "Decision_AllPermitGuard" +- Click "Remove" + +3) When using SDNC, the JSON template for DMaaP messages has a wrong "input" field + +Resolution: Replace the "input" field in the JSON template with "output" + +- Connect to the SDNC container from the Rancher VM in the Kubernetes cluster, for example + +:: + + kubectl exec -it -n onap dev-sdnc-sdnc-0 bash + +- Install your favorite text editor, for example + +:: + + apt-get update; apt-get install vim -y + +- Open /opt/onap/sdnc/restapi/templates/lcm-dmaap-publish-template.json and replace "input" with "output" in the JSON object body +- Save the changes +- If SDNC is deployed in cluster mode (3 SDNC replicas, dev-sdnc-sdnc-0, dev-sdnc-sdnc-1, dev-sdnc-sdnc-2), apply the same change to all the replicas in the cluster. + diff --git a/docs/docs_vcpe_tosca.rst b/docs/docs_vcpe_tosca.rst new file mode 100644 index 000000000..faa4e7590 --- /dev/null +++ b/docs/docs_vcpe_tosca.rst @@ -0,0 +1,136 @@ +vCPE of Tosca Use Case +---------------------- + +Source files +~~~~~~~~~~~ + +vCPE tosca file url: https://git.onap.org/demo/tree/tosca/vCPE + +5 VNFs are here for the ONAP vCPE use case. This VNFD is transformed manually from vCPE heat template. +Please run "./generate_csar.sh" to create the CSAR package files for these 5 VNFS. CSAR package file is just a zip formatted file. If you want to use SRIOV SRIOV-NIC", please run "./generate_csar.sh sriov" to create the CSAR package files for SRIOV. + + +Description +~~~~~~~~~~ + +The use case is composed of five virtual functions (VFs): Infrastructure including vDNS, vDHCP, vAAA(Authorization, Authentication, Accounting) and +vWEB, vBNG(Virtual Broadband Network Gateway), vGMUX(Virtual Gateway Multiplexer), vBRGEMU(Bridged Residential Gateway) and vGW(Virtual Gateway). +Infrastructure VF run in one VM. the other VFs run in separate four VMs. We will send much data from vBRGEMU to vGW. we need to accelarate it using SRIOV-NIC. + + +Test Plan: +~~~~~~~~~~~~~~~~~~ + +The test plan 3 in https://wiki.onap.org/pages/viewpage.action?pageId=41421112. +Test Plan 3: VF-C HPA testing +This test plan covers the tests related to testing +Support for the vCPE use case in VF-C + +Use vCPE (Infra, vGW, vBNG, vBRGEMU and vGMUX) + +Infra part of policy asking for: +:: + + 2 vcpus + >= 2Gbytes of memory + > 40Gbytes of disk + +vGW part of policy asking for: +:: + + 2 vcpus + >=4Gbytes of memory + >= 40Gbytes of disk + Numa page size: 2Mbytes and pages 1024 + with one SRIOV-NIC + +vBNG part of policy asking for: +:: + + 2 vcpus + >= 2Gbytes of memory + > 40Gbytes of disk + Numa page size: 2Mbytes and pages 1024 + with one SRIOV-NIC + +vBGREMU part of policy asking for: +:: + + 2 vcpus + >= 2Gbytes of memory + >= 40Gbytes of disk + Numa page size: 2Mbytes and pages 1024 + with one SRIOV-NIC + +vGMUX part of policy asking for: +:: + + 2 vcpus + >= 2Gbytes of memory + > 40Gbytes of disk + Numa page size: 2Mbytes and pages 1024 + with one SRIOV-NIC + +Instantiate the VNF +Check for results: +It would have selected flavor13 for vGW, vBNG, vBRGEMU and vGMUX VMs. It would have selected flavor13 and flavor12 for Infrastructure. + +Test Steps: +~~~~~~~~~~ + +VIM Configuration: +^^^^^^^^^^^^^^^^^^ + +If you want to use SRIOV-NIC, you need first config SRIOV NIC to refer to [1]. +[1] https://docs.openstack.org/ocata/networking-guide/config-sriov.html + +ONAP managing 1 cloud-region which have three flavors. +Flavor 11: +2 vcpus, 1 Gbytes of memory, 20Gb disk +Numa page size: 2Mbytes and number pages 512 +:: + + openstack flavor create onap.hpa.flavor11 -id auto --ram 1024 --disk 20 --vcpus 2 + +Flavor 12: +2 vcpus, 2 Gbytes of memory, 20Gb disk +Numa page size: 2Mbytes and number pages 1024 +:: + + openstack flavor create onap.hpa.flavor12 -id auto --ram 2048 --disk 20 --vcpus 2 + +Flavor 13: +2 vcpus, 4 Gbytes of memory, 20Gb disk +Huge page size: 2Mbytes and number pages 2048 +1 SRIOV-NIC VF +:: + + openstack flavor create onap.hpa.flavor13 -id auto --ram 4096 --disk 20 -vcpus 2 + openstack flavor set onap.hpa.flavor11 --property aggregate_instance_extra_specs:sriov_nic=sriov-nic-intel-1234-5678-physnet1:1 + openstack aggregate create --property sriov_nic=sriov-nic-intel-1234-5678-physnet1:1 hpa_aggr11 + +comments: you must change 1234 and 5678 to real vendor id and product id. you also need change physnet1 to the provider network. + +Policy Configuration: +^^^^^^^^^^^^^^^^^^^^^ + +After the patch https://gerrit.onap.org/r/#/c/73502/ is merged. With the generated policy and do some manually update as follows, the service could be distributed successfully and the Policy/VFC/OOF could work as excepted. + +- Need manually modify policy item because the “vendor id” and “PCI device id” and “architecture” must be changed in different VIMs since we have different PCI devices in different VIMs +- The value of mandatory in CSAR is “true”, OOF is case intensive, it needs to use “True”. Have to update it. suggest OOF to use ignoreCase in R4. +- The attribute key in CSAR is pciNumDevices, but the responding one in OOF/Mutlicloud is pciCount. Suggest keeping alignment in R4. +- The policy scope has to add a value “us” into it which is a configuration issue in OOF side. Policy side also need do improvement to deal with policy scope automatically append instead of replacement so such policy could be used by several services at the same time. + + +Running the Use Case +~~~~~~~~~~~~~~~~~~~ + +We design vCPE in SDC and distribute it to VFC and Policy and UUI. We can click onboarding VNF and onboarding NS. we can instance it. + +Known issues and resolution +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- Some SDC NS data model is not aligned to VFC NS data model, VFC NS also according to ETSI SOL0001. we also can refer to https://jira.onap.org/browse/SDC-1897. we have a workaround for this issue, we put the service as artifact file and distribute to VFC. +- NFV Tosca parser bug https://jira.opnfv.org/browse/PARSER-187. we also filed a bug in VFC https://jira.onap.org/browse/VFC-1196. +- 'artifacts' definition is missing in the exported csar's VDU node, we also can refer to https://jira.onap.org/browse/SDC-1900. It’s a very hacky workaround in VFC’s GVFNM. Because currently the only use case will use GVFNM is vCPE, which only uses the ubuntu16.04 image, so GVFNM just makes the ubuntu16.04 image as the default if the "sw_image" artifact is missing in the SDC’s exported CSAR. +- OOF patch https://gerrit.onap.org/r/#/c/73332/ is not accepted by 1.2.4 image.It will be accepted by 1.2.5 image. but 1.2.5 image is not release. If you want to use it, you can use 1.2.5-SNAPSHOT-latest. If you use 1.2.4 image, you also need to modify code according to the patch. diff --git a/docs/docs_vfw.rst b/docs/docs_vfw.rst new file mode 100644 index 000000000..af47c464b --- /dev/null +++ b/docs/docs_vfw.rst @@ -0,0 +1,80 @@ +vFirewall Use Case +------------------ + +Source files +~~~~~~~~~~~~ + +- vFirewall/vSink template file: https://git.onap.org/demo/plain/heat/vFWCL/vFWSNK/base_vfw.yaml +- vFirewall/vSink environment file: https://git.onap.org/demo/plain/heat/vFWCL/vFWSNK/base_vfw.env + +- vPacketGenerator template file: https://git.onap.org/demo/plain/heat/vFWCL/vPKG/base_vpkg.yaml +- vPacketGenerator environment file: https://git.onap.org/demo/plain/heat/vFWCL/vPKG/base_vpkg.env + + +Description +~~~~~~~~~~~ + +The use case is composed of three virtual functions (VFs): packet generator, firewall, and traffic sink. +These VFs run in three separate VMs. The packet generator sends packets to the packet sink through the firewall. +The firewall reports the volume of traffic passing though to the ONAP DCAE collector. To check the traffic volume +that lands at the sink VM, you can access the link http://sink_ip_address:667 through your browser and enable +automatic page refresh by clicking the "Off" button. You can see the traffic volume in the charts. + +The packet generator includes a script that periodically generates different volumes of traffic. The closed-loop +policy has been configured to re-adjust the traffic volume when high-water or low-water marks are crossed. + + +Closed-Loop for vFirewall Use Case +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Through the ONAP Portal's Policy Portal, we can find the configuration and operation policies that are currently +enabled for the vFirewall use case: + +- The configuration policy sets the thresholds for generating an onset event from DCAE to the Policy engine. Currently, the high-water mark is set to 700 packets while the low-water mark is set to 300 packets. The measurement interval is set to 10 seconds. +- When a threshold is crossed (i.e. the number of received packets is below 300 packets or above 700 packets per 10 seconds), the Policy engine executes the operational policy to request APPC to adjust the traffic volume to 500 packets per 10 seconds. +- APPC sends a request to the packet generator to adjust the traffic volume. +- Changes to the traffic volume can be observed through the link http://sink_ip_address:667. + + +Adjust packet generator +~~~~~~~~~~~~~~~~~~~~~~~ + +The packet generator contains 10 streams: fw_udp1, fw_udp2, fw_udp3, ..., fw_udp10. Each stream generates 100 packets +per 10 seconds. A script in /opt/run_traffic_fw_demo.sh on the packet generator VM starts automatically and alternates high +traffic (i.e. 10 active streams at the same time) and low traffic (1 active stream) every 5 minutes. + +To enable a stream, include + +:: + + {"id":"fw_udp1", "is-enabled":"true"} in the pg-stream bracket + +To adjust the traffic volume produced by the packet generator, run the following command in a shell, replacing PacketGen_IP in +the HTTP argument with localhost (if you run it in the packet generator VM) or the packet generator IP address: + +:: + + curl -X PUT -H "Authorization: Basic YWRtaW46YWRtaW4=" -H "Content-Type: application/json" -H "Cache-Control: no-cache" -d '{"pg-streams":{"pg-stream": [{"id":"fw_udp1", "is-enabled":"true"},{"id":"fw_udp2", "is-enabled":"true"},{"id":"fw_udp3", "is-enabled":"true"},{"id":"fw_udp4", "is-enabled":"true"},{"id":"fw_udp5", "is-enabled":"true"}]}}' "http://PacketGen_IP:8183/restconf/config/sample-plugin:sample-plugin/pg-streams" + +The command above enables 5 streams. + + +Running the Use Case +~~~~~~~~~~~~~~~~~~~~ +Users can run the use case using the automated Robot Framework or manually. For using the Robot Framework in an ONAP instance installed with OOM, users have to connect to the Rancher VM and run the following command: + +:: + + bash oom/kubernetes/robot/demo-k8s.sh <namespace> vfwclosedloop <pgn-ip-address> + +The script sets the packet generator to high and low rates, and checks whether the policy kicks in to modulate the rates back to medium. + +For documentation about running the use case manually for previous releases, please look at the videos and the material available at this `wiki page`__. + +__ https://wiki.onap.org/display/DW/Running+the+ONAP+Demos + +Although videos are still valid, users are encouraged to use the Heat templates linked at the top of this page rather than the old Heat templates in that wiki page. + +Known issues and resolution +~~~~~~~~~~~~~~~~~~~~~~~~~~~ +The packet generator may become unresponsive to external inputs like changing the number of active streams. To solve the problem, reboot the packet generator VM.
\ No newline at end of file diff --git a/docs/docs_vlb.rst b/docs/docs_vlb.rst new file mode 100644 index 000000000..07671cd75 --- /dev/null +++ b/docs/docs_vlb.rst @@ -0,0 +1,103 @@ +vLoadBalancer Use Case +---------------------- + +Source files +~~~~~~~~~~~~ + +- Base VNF template file: https://git.onap.org/demo/plain/heat/vLB/base_vlb.yaml +- Base VNF environment file: https://git.onap.org/demo/plain/heat/vLB/base_vlb.env + +- VF module scaling template file: https://git.onap.org/demo/plain/heat/vLB/dnsscaling.yaml +- VF module scaling environment file: https://git.onap.org/demo/plain/heat/vLB/dnsscaling.env + + +Description +~~~~~~~~~~~ +The use case is composed of three VFs: packet generator, load balancer, and DNS server. These VFs run in three separate VMs. The packet generator issues DNS lookup queries that reach the DNS server via the load balancer. DNS replies reach the packet generator via the load balancer as well. The load balancer reports the average amount of traffic per DNS over a time interval to the DCAE collector. When the average amount of traffic per DNS server crosses a predefined threshold, the closed-loop is triggered and a new DNS server is instantiated. + +To test the application, make sure that the security group in OpenStack has ingress/egress entries for protocol 47 (GRE). The user can run a DNS query from the packet generator VM: + +:: + + dig @vLoadBalancer_IP host1.dnsdemo.onap.org + +The output below means that the load balancer has been set up correctly, has forwarded the DNS queries to one DNS instance, and the packet generator has received the DNS reply message. + +:: + + ; <<>> DiG 9.10.3-P4-Ubuntu <<>> @192.168.9.111 host1.dnsdemo.onap.org + ; (1 server found) + ;; global options: +cmd + ;; Got answer: + ;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 31892 + ;; flags: qr aa rd; QUERY: 1, ANSWER: 1, AUTHORITY: 1, ADDITIONAL: 2 + ;; WARNING: recursion requested but not available + + ;; OPT PSEUDOSECTION: + ; EDNS: version: 0, flags:; udp: 4096 + ;; QUESTION SECTION: + ;host1.dnsdemo.onap.org. IN A + + ;; ANSWER SECTION: + host1.dnsdemo.onap.org. 604800 IN A 10.0.100.101 + + ;; AUTHORITY SECTION: + dnsdemo.onap.org. 604800 IN NS dnsdemo.onap.org. + + ;; ADDITIONAL SECTION: + dnsdemo.onap.org. 604800 IN A 10.0.100.100 + + ;; Query time: 0 msec + ;; SERVER: 192.168.9.111#53(192.168.9.111) + ;; WHEN: Fri Nov 10 17:39:12 UTC 2017 + ;; MSG SIZE rcvd: 97 + + +Closedloop for vLoadBalancer/vDNS +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Through the Policy Portal (accessible via the ONAP Portal), we can find the configuration and operation policies that are enabled by default for the vLoadBalancer/vDNS application: + +- The configuration policy sets the thresholds for generating an onset event from DCAE to the Policy engine. Currently, the threshold is set to 200 packets, while the measurement interval is set to 10 seconds; +- Once the threshold is crossed (e.g. the number of received packets is above 200 packets per 10 seconds), the Policy Engine executes the operational policy. The Policy engine queries A&AI to fetch the VNF UUID and sends a request to the Service Orchestrator (SO) to spin up a new DNS instance for the VNF identified by that UUID; +- SO spins up a new DNS instance. + + +To change the volume of queries generated by the packet generator, run the following command in a shell, replacing PacketGen_IP in the HTTP argument with localhost (if you run it in the packet generator VM) or the packet generator IP address: + +:: + + + curl -X PUT -H "Authorization: Basic YWRtaW46YWRtaW4=" -H "Content-Type: application/json" -H "Cache-Control: no-cache" -d '{"pg-streams":{"pg-stream": [{"id":"dns1", "is-enabled":"true"}]}}' "http://PacketGen_IP:8183/restconf/config/sample-plugin:sample-plugin/pg-streams" + +- {"id":"dns1", "is-enabled":"true"} shows the stream "dns1" is enabled. The packet generator sends requests in the rate of 100 packets per 10 seconds; +- To increase the amount of traffic, you can enable more streams. The packet generator has 10 streams, "dns1", "dns2", "dns3" to "dns10". Each of them generates 100 packets per 10 seconds. To enable the streams, please add {"id":"dnsX", "is-enabled":"true"} to the pg-stream bracket of the curl command, where X is the stream ID. + +For example, if you want to enable 3 streams, the curl command will be: + +:: + + curl -X PUT -H "Authorization: Basic YWRtaW46YWRtaW4=" -H "Content-Type: application/json" -H "Cache-Control: no-cache" -d '{"pg-streams":{"pg-stream": [{"id":"dns1", "is-enabled":"true"}, {"id":"dns2", "is-enabled":"true"},{"id":"dns3", "is-enabled":"true"}]}}' "http://PacketGen_IP:8183/restconf/config/sample-plugin:sample-plugin/pg-streams" + +When the VNF starts, the packet generator is automatically configured to run 5 streams. + + +Running the Use Case +~~~~~~~~~~~~~~~~~~~~ +Automated closed loop via Robot Framework is not supported at this time. For documentation about running the use case manually for previous releases, please look at the videos and the material available at this `wiki page`__. + +__ https://wiki.onap.org/display/DW/Running+the+ONAP+Demos + +Although videos are still valid, users are encouraged to use the Heat templates linked at the top of this page rather than the old Heat templates in that wiki page. + +Known issues and resolution +~~~~~~~~~~~~~~~~~~~~~~~~~~~ +1) The packet generator may become unresponsive and stop generating traffic. To solve the problem, reboot the packet generator. + +2) The base and scaling VF module names need to follow a specific naming convention: + + a) The base VF module name must be "Vfmodule\_xyz" + + b) The SDNC preload for the scaling VF module must set the VF module name to "vDNS\_xyz", where "xyz" is the same as the base module. This is required because during closed loop Policy looks for "Vfmodule\_" and replaces it with "vDNS\_" + +3) Only one scaling operation is supported.
\ No newline at end of file diff --git a/docs/index.rst b/docs/index.rst index f018fc6ce..05befb182 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -8,4 +8,4 @@ The Integration project provides the followning artifacts: - Test suites to check the various ONAP components based on Robot Framework - Artifacts for the use-case deployments -.. include:: heat.rst +.. include:: onap-oom-heat.rst diff --git a/docs/onap-oom-heat.rst b/docs/onap-oom-heat.rst new file mode 100644 index 000000000..cc9ceb7ba --- /dev/null +++ b/docs/onap-oom-heat.rst @@ -0,0 +1,148 @@ +.. _onap-oom-heat: + +ONAP OOM HEAT Template +---------------------- + + +Source files +~~~~~~~~~~~~ + +- HEAT template files: https://git.onap.org/integration/tree/deployment/heat/onap-oom?h=casablanca +- Sample OpenStack RC file: https://git.onap.org/integration/tree/deployment/heat/onap-oom/env/windriver/Integration-SB-00-openrc?h=casablanca +- Sample environment file: https://git.onap.org/integration/tree/deployment/heat/onap-oom/env/windriver/onap-oom.env?h=casablanca +- Deployment script: https://git.onap.org/integration/tree/deployment/heat/onap-oom/scripts/deploy.sh?h=casablanca + + +Description +~~~~~~~~~~~ + +The ONAP Integration Project provides a sample HEAT template that +fully automates the deployment of ONAP using OOM as described in +:ref:`ONAP Operations Manager (OOM) over Kubernetes<installing-onap>`. + +The ONAP OOM HEAT template deploys the entire ONAP platform. It spins +up an HA-enabled Kubernetes cluster, and deploys ONAP using OOM onto +this cluster. +- 1 Rancher VM that also serves as a shared NFS server +- 3 etcd VMs for the Kubernetes HA etcd plane +- 2 orch VMs for the Kubernetes HA orchestration plane +- 12 k8s VMs for the Kubernetes HA compute hosts + + +Quick Start +~~~~~~~~~~~ + +Using the Wind River lab configuration as an example, here is what +you need to do to deploy ONAP: + +:: + + git clone https://git.onap.org/integration + cd integration/deployment/heat/onap-oom/ + source ./env/windriver/Integration-SB-00-openrc + ./scripts/deploy.sh ./env/windriver/onap-oom.env + + +Environment and RC files +~~~~~~~~~~~~~~~~~~~~~~~~ + +Before deploying ONAP to your own environment, it is necessary to +customize the environment and RC files. You should make a copy of the +sample RC and environment files shown above and customize the values +for your specific OpenStack environments. + +The environment file contains a block called +integration_override_yaml. The content of this block will be created +as the file integration_override.yaml in the deployed Rancher VM, and +used as the helm override files during the OOM deployment. Be sure to +customize the necessary values within this block to match your +OpenStack environment as well. + +**Notes on select parameters** + +:: + + apt_proxy: 10.12.5.2:8000 + docker_proxy: 10.12.5.2:5000 + + rancher_vm_flavor: m1.large + k8s_vm_flavor: m1.xlarge + etcd_vm_flavor: m1.medium + orch_vm_flavor: m1.medium + + key_name: onap_key + + helm_deploy_delay: 2.5m + +It is recommended that you set up an apt proxy and a docker proxy +local to your lab. If you do not wish to use such proxies, you can +set the apt_proxy and docker_proxy parameters to the empty string "". + +rancher_vm_flavor needs to have 8 GB of RAM. +k8s_vm_flavor needs to have 16 GB of RAM. +etcd_vm_flavor needs to have 4 GB of RAM. +orch_vm_flavor needs to have 4 GB of RAM. + +By default the template assumes that you have already imported a +keypair named "onap_key" into your OpenStack environment. If the +desired keypair has a different name, change the key_name parameter. + +The helm_deploy_delay parameter introduces a delay in-between the +deployments of each ONAP helm subchart to help alleviate system load or +contention issues caused by trying to spin up too many pods +simultaneously. The value of this parameter is passed to the Linux +"sleep" command. Adjust this parameter based on the performance and +load characteristics of your OpenStack environment. + + +Exploring the Rancher VM +~~~~~~~~~~~~~~~~~~~~~~~~ + +The Rancher VM that is spun up by this HEAT template serves the +following key roles: +- Installaion of the Rancher server +- Hosts the /dockerdata-nfs/ NFS export shared by all the k8s VMs for persistent volumes +- git clones the oom repo into /root/oom +- git clones the integration repo into /root/integration +- Creates the helm override file at /root/integration-override.yaml +- Deploys ONAP using helm and OOM + + + +.. _deploy-updated-manifest: + +Deploying an Updated Docker Manifest +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Some late changes in the ONAP docker images did not make it in time +for the Casablanca release. Depending on the Use Case you are trying +deploy, you may need to update the docker image manifest with certain +newer docker image versions than what was shipped with ONAP Casablanca +release. + +The ONAP integration repo contains a script that will apply the docker +versions specified in a given manifest into the OOM helm chart +definitions. + +To apply an updated manifest (on the Rancher VM): + +:: + + cd /root/integration/version-manifest/src/main/resources + cp docker-manifest.csv docker-manifest-custom.csv + + # customize docker-manifest-custom.csv per your requirements + + ../scripts/update-oom-image-versions.sh ./docker-manifest-custom.csv /root/oom/ + + cd /root/oom/kubernetes/ + git diff # verify that the desired docker image changes are applied successfully + make all # recompile the helm charts + +After that you can update or redeploy ONAP OOM as described here: + +.. toctree:: + :maxdepth: 1 + :titlesonly: + + ../../../../submodules/oom.git/docs/oom_quickstart_guide.rst diff --git a/test/vcpe/cleanvGMUX.py b/test/vcpe/cleanvGMUX.py new file mode 100755 index 000000000..8b2751f45 --- /dev/null +++ b/test/vcpe/cleanvGMUX.py @@ -0,0 +1,65 @@ +#! /usr/bin/python + +import sys +import logging +import requests +import json +from datetime import datetime +import time + +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 = '' + +def list_interface(): + url = base_url + logger.info(url) + r = requests.get(url, headers=headers, auth=auth) + logger.debug(r) + response = r.json() + + logger.debug('---------------------------------------------------------------') + logger.debug(json.dumps(response, indent=4, sort_keys=True)) + logger.debug('---------------------------------------------------------------') + +def clean_gmux(): + url = base_url + r = requests.get(url, headers=headers, auth=auth) + response = r.json() + + interfaces = response.get('interfaces').get('interface') + for inf in interfaces: + name = inf.get('name') + if name.startswith('vxlanTun10'): + logger.debug('name = {0}'.format(name)) + delete_interface_v3po_l2(name) + + for inf in interfaces: + name = inf.get('name') + if name.startswith('vxlanTun10'): + logger.debug('name = {0}'.format(name)) + delete_interface(name) + +def delete_interface_v3po_l2(interface_name): + url = '{0}/interface/{1}/v3po:l2'.format(base_url, interface_name) + r = requests.delete(url, headers=headers, auth=auth) + logger.debug(r) + +def delete_interface(interface_name): + url = '{0}/interface/{1}'.format(base_url, interface_name) + r = requests.delete(url, headers=headers, auth=auth) + 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() + clean_gmux() + logger.debug('---------------------------------------------------------------') + logger.debug('list interfaces after cleaning gmux') + list_interface() diff --git a/test/vcpe/config_sdnc_so.py b/test/vcpe/config_sdnc_so.py index 7c063b5fd..2cfc0f9f3 100755 --- a/test/vcpe/config_sdnc_so.py +++ b/test/vcpe/config_sdnc_so.py @@ -78,7 +78,9 @@ def insert_customer_service_to_so(vcpecommon): "`SERVICE_MODEL_UUID`) VALUES ('createInstance','1','{0}'," \ "'/mso/async/services/CreateVcpeResCustService',NULL,181,NULL, NOW()," \ "'{1}');".format(parser.svc_model['modelName'], parser.svc_model['modelVersionId'])) + vcpecommon.execute_cmds_so_db(cmds) + cmds = [] cmds.append("delete from `heat_template_params` where" "`HEAT_TEMPLATE_ARTIFACT_UUID`='efee1d84-b8ec-11e7-abc4-cec278b6b50a';") cmds.append("delete from `heat_template` where ARTIFACT_UUID='efee1d84-b8ec-11e7-abc4-cec278b6b50a';") diff --git a/test/vcpe/healthcheck-k8s.py b/test/vcpe/healthcheck-k8s.py index 0aea3fb9e..0aea3fb9e 100644..100755 --- a/test/vcpe/healthcheck-k8s.py +++ b/test/vcpe/healthcheck-k8s.py diff --git a/test/vcpe/loop.py b/test/vcpe/loop.py index ad5879715..d0243960e 100755 --- a/test/vcpe/loop.py +++ b/test/vcpe/loop.py @@ -25,7 +25,7 @@ hosts = cpecommon.get_vm_ip(nodes) custom.del_vgmux_ves_mode(hosts['mux']) time.sleep(2) custom.del_vgmux_ves_collector(hosts['mux']) -exit() +#exit() time.sleep(2) logging.info('Setting vGMUX DCAE collector IP address') diff --git a/test/vcpe/preload.py b/test/vcpe/preload.py index 0d451d24f..0108566da 100755 --- a/test/vcpe/preload.py +++ b/test/vcpe/preload.py @@ -128,7 +128,7 @@ class Preload: } replace_dict.update(commont_dict) self.logger.info('Preloading vGW-GRA') - return self.preload(template_file, replace_dict, self.vcpecommon.sdnc_preload_vnf_url) + return self.preload(template_file, replace_dict, self.vcpecommon.sdnc_preload_gra_url) def preload_vfmodule(self, template_file, service_instance_id, vnf_model, vfmodule_model, common_dict, name_suffix): """ @@ -156,6 +156,7 @@ class Preload: '${vnf_name}': vfmodule_name, '${mr_ip_addr}': self.vcpecommon.mr_ip_addr, '${mr_ip_port}': self.vcpecommon.mr_ip_port, + '${sdnc_oam_ip}': self.vcpecommon.sdnc_oam_ip, '${suffix}': name_suffix} replace_dict.update(common_dict) self.logger.info('Preloading VF Module ' + vfmodule_name) diff --git a/test/vcpe/preload_templates/simple_neutron_heat.yaml b/test/vcpe/preload_templates/simple_neutron_heat.yaml index d20c08127..f64248be8 100644 --- a/test/vcpe/preload_templates/simple_neutron_heat.yaml +++ b/test/vcpe/preload_templates/simple_neutron_heat.yaml @@ -8,7 +8,7 @@ parameters: shared: type: boolean description: Shared amongst tenants - default: True + default: False outputs: network_id: description: Openstack network identifier diff --git a/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json index 7ef2fb7db..0758dc189 100644 --- a/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json @@ -85,7 +85,7 @@ }, { "vnf-parameter-name": "sdnc_ip_addr", - "vnf-parameter-value": "${sdnc_brg_bng_ip}" + "vnf-parameter-value": "${sdnc_oam_ip}" }, { "vnf-parameter-name": "vbng_private_ip_0", diff --git a/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json index 7072f6825..9e04b998e 100644 --- a/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json @@ -63,7 +63,7 @@ }, { "vnf-parameter-name": "sdnc_ip", - "vnf-parameter-value": "${sdnc_brg_bng_ip}" + "vnf-parameter-value": "${sdnc_oam_ip}" }, { "vnf-parameter-name": "vbrgemu_name_0", diff --git a/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json index ced57ca6a..f453aafe2 100644 --- 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}" @@ -112,7 +120,7 @@ ] }, "vf-module-assignments": {}, "vf-module-topology-identifier": { - "vf-module-name": "zRegionOne${vgw_vfmod_name_index}_base_vcpe_vgw_0" + "vf-module-name": "VGW2BRG-${brg_mac}" } }, "vnf-resource-assignments": {}, diff --git a/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json index 87059e1e6..cda93becc 100644 --- a/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json @@ -18,6 +18,14 @@ "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.92" + "vnf-parameter-value": "10.5.0.125" }, { "vnf-parameter-name": "vgw_private_ip_1", - "vnf-parameter-value": "10.0.101.92" + "vnf-parameter-value": "10.0.101.125" }, { "vnf-parameter-name": "vgw_private_ip_2", - "vnf-parameter-value": "10.2.0.7" + "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": "92" + "vnf-parameter-value": "125" }, { "vnf-parameter-name": "onap_private_net_id", diff --git a/test/vcpe/soutils.py b/test/vcpe/soutils.py index 3749689f2..6cddd6d08 100755 --- a/test/vcpe/soutils.py +++ b/test/vcpe/soutils.py @@ -166,6 +166,7 @@ class SoUtils: 'owningEntityName': self.vcpecommon.owning_entity_name} def generate_custom_service_request(self, instance_name, model, brg_mac): + brg_mac_enc = brg_mac.replace(':', '-') req_details = { 'modelInfo': model, 'subscriberInfo': {'subscriberName': 'Kaneohe', @@ -177,8 +178,16 @@ class SoUtils: { 'name': 'BRG_WAN_MAC_Address', 'value': brg_mac - } - , + }, + { + 'name': 'VfModuleNames', + 'value': [ + { + 'VfModuleModelInvariantUuid': self.vcpecommon.vgw_VfModuleModelInvariantUuid, + 'VfModuleName': 'VGW2BRG-{0}'.format(brg_mac_enc) + } + ] + }, { "name": "Customer_Location", "value": self.vcpecommon.customer_location_used_by_oof @@ -208,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/test/vcpe/vcpe.py b/test/vcpe/vcpe.py index 8bd39960a..3fb96c55e 100755 --- a/test/vcpe/vcpe.py +++ b/test/vcpe/vcpe.py @@ -159,7 +159,7 @@ def closed_loop(lossrate=0): time.sleep(2) vcpecommon.del_vgmux_ves_collector() - logger.info('Staring vGMUX data reporting to DCAE') + logger.info('Starting vGMUX data reporting to DCAE') time.sleep(2) vcpecommon.set_vgmux_ves_collector() @@ -174,7 +174,7 @@ def init_so_sdnc(): logger = logging.getLogger('__name__') vcpecommon = VcpeCommon() config_sdnc_so.insert_customer_service_to_so(vcpecommon) - config_sdnc_so.insert_customer_service_to_sdnc(vcpecommon) + #config_sdnc_so.insert_customer_service_to_sdnc(vcpecommon) vgw_vfmod_name_index= 0 vcpecommon.save_object(vgw_vfmod_name_index, vcpecommon.vgw_vfmod_name_index_file) diff --git a/test/vcpe/vcpe_custom_service.py b/test/vcpe/vcpe_custom_service.py index f02802353..36012f7b0 100755 --- a/test/vcpe/vcpe_custom_service.py +++ b/test/vcpe/vcpe_custom_service.py @@ -72,10 +72,11 @@ class CustomService: brg_mac = str(raw_input("Enter the BRG MAC address: ")) else: brg_mac = self.vcpecommon.get_brg_mac_from_sdnc() + brg_mac_enc = brg_mac.replace(':', '-') # get name index self.vgw_vfmod_name_index= self.vcpecommon.load_object(self.vcpecommon.vgw_vfmod_name_index_file) self.vgw_vfmod_name_index=self.vgw_vfmod_name_index + 1 - self.save_object(vgw_vfmod_name_index,self.vcpecommon.vgw_vfmod_name_index_file) + self.vcpecommon.save_object(self.vgw_vfmod_name_index,self.vcpecommon.vgw_vfmod_name_index_file) # preload vGW if preload_dict: preloader = preload.Preload(self.vcpecommon) @@ -83,7 +84,7 @@ class CustomService: self.vcpecommon.increase_ip_address_or_vni_in_template(vgw_template_file, parameters_to_change) preloader.preload_vgw(vgw_template_file, brg_mac, preload_dict, name_suffix) # preload vGW-GRA - preloader.preload_vgw_gra(vgw_gra_template_file, brg_mac, preload_dict, name_suffix, vgw_vfmod_name_index) + preloader.preload_vgw_gra(vgw_gra_template_file, brg_mac_enc, preload_dict, name_suffix, str(self.vgw_vfmod_name_index)) # create service so = soutils.SoUtils(self.vcpecommon, 'v5') diff --git a/test/vcpe/vcpecommon.py b/test/vcpe/vcpecommon.py index f5e1b3046..18390f7fa 100755 --- a/test/vcpe/vcpecommon.py +++ b/test/vcpe/vcpecommon.py @@ -34,8 +34,8 @@ class VcpeCommon: } common_preload_config = { - 'oam_onap_net': 'oam_network_0qV7' if oom_mode else 'oam_onap_lAky', - 'oam_onap_subnet': 'oam_network_0qV7' if oom_mode else 'oam_onap_lAky', + 'oam_onap_net': 'oam_network_AiBB' if oom_mode else 'oam_onap_lAky', + 'oam_onap_subnet': 'oam_network_AiBB' if oom_mode else 'oam_onap_lAky', 'public_net': 'external', 'public_net_id': '971040b2-7059-49dc-b220-4fab50cb2ad4' } @@ -67,14 +67,16 @@ class VcpeCommon: self.logger = logging.getLogger(__name__) self.logger.info('Initializing configuration') + # vgw_VfModuleModelInvariantUuid is in rescust service csar, look in service-VcpesvcRescust1118-template.yml for groups vgw module metadata. TODO: read this value automcatically + self.vgw_VfModuleModelInvariantUuid = 'c16ad38c-2c2c-49ae-bbe8-66c7ffbcc30a' # OOM: this is the address that the brg and bng will nat for config of brg - 10.0.0.x address of k8 host for sdnc - self.sdnc_brg_bng_ip = self.get_pod_node_oam_ip(self.sdnc_controller_pod)[1] + self.sdnc_oam_ip = '10.0.0.20' # OOM: this is a k8 host external IP - self.oom_so_sdnc_aai_ip = '10.12.5.18' + self.oom_so_sdnc_aai_ip = '10.12.5.228' # OOM: this is a k8 host external IP can be same as oom_so_sdnc_aai_ip - self.oom_dcae_ves_collector = '10.12.5.18' + self.oom_dcae_ves_collector = '10.12.5.228' # OOM: this is a k8 host external IP can be same as oom_so_sdnc_aai_ip - self.mr_ip_addr = '10.12.5.18' + self.mr_ip_addr = '10.12.5.228' self.mr_ip_port = '30227' self.so_nbi_port = '30277' if self.oom_mode else '8080' self.sdnc_preloading_port = '30202' if self.oom_mode else '8282' @@ -136,7 +138,7 @@ class VcpeCommon: ############################################################################################# # SO urls, note: do NOT add a '/' at the end of the url self.so_req_api_url = {'v4': 'http://' + self.hosts['so'] + ':' + self.so_nbi_port + '/onap/so/infra/serviceInstantiation/v7/serviceInstances', - 'v5': 'http://' + self.hosts['so'] + ':' + self.so_nbi_port + '/onap/so/infraserviceInstantiation/v7/serviceInstances'} + 'v5': 'http://' + self.hosts['so'] + ':' + self.so_nbi_port + '/onap/so/infra/serviceInstantiation/v7/serviceInstances'} self.so_check_progress_api_url = 'http://' + self.hosts['so'] + ':' + self.so_nbi_port + '/onap/so/infra/orchestrationRequests/v6' self.so_userpass = 'InfraPortalClient', 'password1$' self.so_headers = {'Content-Type': 'application/json', 'Accept': 'application/json'} diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv index 079dc18a2..9712df19a 100644 --- a/version-manifest/src/main/resources/docker-manifest-staging.csv +++ b/version-manifest/src/main/resources/docker-manifest-staging.csv @@ -1,14 +1,14 @@ image,tag -onap/aaf/aaf_agent,2.1.8-SNAPSHOT -onap/aaf/aaf_cass,2.1.8-SNAPSHOT -onap/aaf/aaf_cm,2.1.8-SNAPSHOT -onap/aaf/aaf_config,2.1.8-SNAPSHOT -onap/aaf/aaf_fs,2.1.8-SNAPSHOT -onap/aaf/aaf_gui,2.1.8-SNAPSHOT -onap/aaf/aaf_hello,2.1.8-SNAPSHOT -onap/aaf/aaf_locate,2.1.8-SNAPSHOT -onap/aaf/aaf_oauth,2.1.8-SNAPSHOT -onap/aaf/aaf_service,2.1.8-SNAPSHOT +onap/aaf/aaf_agent,2.1.9-SNAPSHOT +onap/aaf/aaf_cass,2.1.9-SNAPSHOT +onap/aaf/aaf_cm,2.1.9-SNAPSHOT +onap/aaf/aaf_config,2.1.9-SNAPSHOT +onap/aaf/aaf_fs,2.1.9-SNAPSHOT +onap/aaf/aaf_gui,2.1.9-SNAPSHOT +onap/aaf/aaf_hello,2.1.9-SNAPSHOT +onap/aaf/aaf_locate,2.1.9-SNAPSHOT +onap/aaf/aaf_oauth,2.1.9-SNAPSHOT +onap/aaf/aaf_service,2.1.9-SNAPSHOT onap/aaf/abrmd,3.0.0-SNAPSHOT-latest onap/aaf/distcenter,3.0.0-SNAPSHOT-latest onap/aaf/sms,3.0.1-SNAPSHOT-latest @@ -20,8 +20,8 @@ onap/aai-traversal,1.3-STAGING-latest onap/aai/esr-gui,1.2.2-STAGING-latest onap/aai/esr-server,1.2.2-STAGING-latest onap/admportal-sdnc-image,1.4-STAGING-latest -onap/appc-cdt-image,1.4.1-SNAPSHOT-latest -onap/appc-image,1.4.1-SNAPSHOT-latest +onap/appc-cdt-image,1.4.3-SNAPSHOT-latest +onap/appc-image,1.4.3-SNAPSHOT-latest onap/babel,1.3-STAGING-latest onap/ccsdk-apps-ms-neng,0.3-STAGING-latest onap/ccsdk-controllerblueprints,0.3-STAGING-latest @@ -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 @@ -65,11 +65,11 @@ onap/music/cassandra_job,3.0.24 onap/music/cassandra_music,3.0.0 onap/music/music,3.0.24 onap/music/prom,1.0.5 -onap/network-discovery,latest +onap/network-discovery,1.4.2 onap/oom/kube2msb,1.1.0 onap/optf-cmso-dbinit,1.0.1 onap/optf-cmso-service,1.0.1 -onap/optf-has,1.2.4 +onap/optf-has,1.2.5 onap/optf-osdf,1.2.4 onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.0.4 onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.0.0 @@ -117,36 +117,36 @@ onap/sdnc-dmaap-listener-image,1.4-STAGING-latest onap/sdnc-image,1.4-STAGING-latest onap/sdnc-ueb-listener-image,1.4-STAGING-latest onap/search-data-service,1.3-STAGING-latest -onap/service-decomposition,latest +onap/service-decomposition,1.4.2 onap/sniroemulator,1.0.0 -onap/so/api-handler-infra,1.3.1-STAGING-latest -onap/so/bpmn-infra,1.3.1-STAGING-latest -onap/so/catalog-db-adapter,1.3.1-STAGING-latest -onap/so/openstack-adapter,1.3.1-STAGING-latest -onap/so/request-db-adapter,1.3.1-STAGING-latest -onap/so/sdc-controller,1.3.1-STAGING-latest -onap/so/sdnc-adapter,1.3.1-STAGING-latest -onap/so/so-monitoring,1.3.1-STAGING-latest -onap/so/vfc-adapter,1.3.1-STAGING-latest +onap/so/api-handler-infra,1.3.2-STAGING-latest +onap/so/bpmn-infra,1.3.2-STAGING-latest +onap/so/catalog-db-adapter,1.3.2-STAGING-latest +onap/so/openstack-adapter,1.3.2-STAGING-latest +onap/so/request-db-adapter,1.3.2-STAGING-latest +onap/so/sdc-controller,1.3.2-STAGING-latest +onap/so/sdnc-adapter,1.3.2-STAGING-latest +onap/so/so-monitoring,1.3.2-STAGING-latest +onap/so/vfc-adapter,1.3.2-STAGING-latest onap/sparky-be,1.3-STAGING-latest -onap/spike,1.0-STAGING-latest -onap/testsuite,1.3.1-STAGING-latest +onap/spike,1.3-STAGING-latest +onap/testsuite,1.4.0-STAGING-latest 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 534105578..35e4c2328 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -1,5 +1,6 @@ image,tag onap/aaf/aaf_agent,2.1.8 +onap/aaf/aaf_cass,2.1.8 onap/aaf/aaf_cm,2.1.8 onap/aaf/aaf_config,2.1.8 onap/aaf/aaf_fs,2.1.8 @@ -19,9 +20,9 @@ onap/aai-resources,1.3.3 onap/aai-traversal,1.3.2 onap/aai/esr-gui,1.2.1 onap/aai/esr-server,1.2.1 -onap/admportal-sdnc-image,1.4.1 -onap/appc-cdt-image,1.4.0 -onap/appc-image,1.4.0 +onap/admportal-sdnc-image,1.4.3 +onap/appc-cdt-image,1.4.3 +onap/appc-image,1.4.3 onap/babel,1.3.2 onap/ccsdk-ansible-server-image,0.3.1 onap/ccsdk-apps-ms-neng,0.3.1 @@ -33,14 +34,15 @@ 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/data-router,1.3.1 onap/dcae-be,1.3.0 onap/dcae-dt,1.2.0 onap/dcae-fe,1.3.0 +onap/dcae-tools,1.3.0 onap/dcae-tosca-app,1.3.0 onap/dmaap/buscontroller,1.0.23 -onap/dmaap/datarouter-node,1.0.3 -onap/dmaap/datarouter-prov,1.0.3 +onap/dmaap/datarouter-node,1.0.6 +onap/dmaap/datarouter-prov,1.0.6 onap/dmaap/dmaap-mr,1.1.8 onap/dmaap/kafka01101,0.0.1 onap/externalapi/nbi,3.0.1 @@ -51,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 @@ -63,10 +65,11 @@ onap/music/cassandra_job,3.0.24 onap/music/cassandra_music,3.0.0 onap/music/music,3.0.24 onap/music/prom,1.0.5 +onap/network-discovery,1.4.2 onap/oom/kube2msb,1.1.0 onap/optf-cmso-dbinit,1.0.1 onap/optf-cmso-service,1.0.1 -onap/optf-has,1.2.4 +onap/optf-has,1.2.5 onap/optf-osdf,1.2.4 onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.0.4 onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.0.0 @@ -98,55 +101,59 @@ onap/portal-app,2.3.1 onap/portal-db,2.3.1 onap/portal-sdk,2.3.1 onap/portal-wms,2.3.1 -onap/sdc-backend,1.3.3 -onap/sdc-backend-init,1.3.3 -onap/sdc-cassandra,1.3.3 -onap/sdc-cassandra-init,1.3.3 -onap/sdc-elasticsearch,1.3.3 -onap/sdc-frontend,1.3.3 -onap/sdc-init-elasticsearch,1.3.3 -onap/sdc-kibana,1.3.3 -onap/sdc-onboard-backend,1.3.3 -onap/sdc-onboard-cassandra-init,1.3.3 -onap/sdnc-ansible-server-image,1.4.1 -onap/sdnc-dmaap-listener-image,1.4.1 -onap/sdnc-image,1.4.1 -onap/sdnc-ueb-listener-image,1.4.1 +onap/sdc-api-tests,1.3.4 +onap/sdc-backend,1.3.4 +onap/sdc-backend-init,1.3.4 +onap/sdc-cassandra,1.3.4 +onap/sdc-cassandra-init,1.3.4 +onap/sdc-elasticsearch,1.3.4 +onap/sdc-frontend,1.3.4 +onap/sdc-init-elasticsearch,1.3.4 +onap/sdc-kibana,1.3.4 +onap/sdc-onboard-backend,1.3.4 +onap/sdc-onboard-cassandra-init,1.3.4 +onap/sdc-ui-tests,1.3.4 +onap/sdnc-ansible-server-image,1.4.3 +onap/sdnc-dmaap-listener-image,1.4.3 +onap/sdnc-image,1.4.3 +onap/sdnc-ueb-listener-image,1.4.3 onap/search-data-service,1.3.1 +onap/service-decomposition,1.4.2 onap/sniroemulator,1.0.0 -onap/so/api-handler-infra,1.3.1 -onap/so/bpmn-infra,1.3.1 -onap/so/catalog-db-adapter,1.3.1 -onap/so/openstack-adapter,1.3.1 -onap/so/request-db-adapter,1.3.1 -onap/so/sdc-controller,1.3.1 -onap/so/sdnc-adapter,1.3.1 -onap/so/so-monitoring,1.3.1 -onap/so/vfc-adapter,1.3.1 +onap/so/api-handler-infra,1.3.2 +onap/so/bpmn-infra,1.3.2 +onap/so/catalog-db-adapter,1.3.2 +onap/so/openstack-adapter,1.3.2 +onap/so/request-db-adapter,1.3.2 +onap/so/sdc-controller,1.3.2 +onap/so/sdnc-adapter,1.3.2 +onap/so/so-monitoring,1.3.2 +onap/so/vfc-adapter,1.3.2 onap/sparky-be,1.3.0 -onap/testsuite,1.3.1 +onap/spike,1.3.1 +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 onap/vfc/wfengine-mgrservice,1.2.0 onap/vfc/ztesdncdriver,1.2.0 onap/vfc/ztevnfmdriver,1.2.1 -onap/vid,3.2.0 +onap/vid,3.2.2 onap/vnfsdk/ice,1.1.0 onap/vnfsdk/refrepo,1.2.0 onap/vnfsdk/refrepo/postgres,1.2.0 diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index c385fb177..143de1755 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -59,72 +59,73 @@ org.onap.aai.resources,resources,1.3.3 org.onap.aai.router-core,router-core,1.3.0 org.onap.aai.sparky-be,sparky-be,1.3.0 org.onap.aai.sparky-fe,sparky-fe,1.3.0 +org.onap.aai.spike,spike,1.3.1 org.onap.aai.traversal,aai-traversal,1.3.2 org.onap.aai.traversal,traversal,1.3.2 org.onap.aai.validation,validation,1.3.1 -org.onap.appc,appc-aai-client-provider,1.4.2 -org.onap.appc,appc-ansible-adapter-bundle,1.4.2 -org.onap.appc,appc-artifact-handler-provider,1.4.2 -org.onap.appc,appc-chef-adapter-bundle,1.4.2 -org.onap.appc,appc-command-executor-api,1.4.2 -org.onap.appc,appc-command-executor-core,1.4.2 -org.onap.appc,appc-common,1.4.2 -org.onap.appc,appc-config-adaptor-provider,1.4.2 -org.onap.appc,appc-config-audit-provider,1.4.2 -org.onap.appc,appc-config-data-services-provider,1.4.2 -org.onap.appc,appc-config-encryption-tool-provider,1.4.2 -org.onap.appc,appc-config-flow-controller-provider,1.4.2 -org.onap.appc,appc-config-generator-provider,1.4.2 -org.onap.appc,appc-config-params-provider,1.4.2 -org.onap.appc,appc-data-access-lib,1.4.2 -org.onap.appc,appc-design-services-provider,1.4.2 -org.onap.appc,appc-dg-aai,1.4.2 -org.onap.appc,appc-dg-common,1.4.2 -org.onap.appc,appc-dg-license-manager,1.4.2 -org.onap.appc,appc-dg-mdsal-store,1.4.2 -org.onap.appc,appc-dg-netconf,1.4.2 -org.onap.appc,appc-dg-provider,1.4.2 -org.onap.appc,appc-dg-ssh,1.4.2 -org.onap.appc,appc-dg-util-bundle,1.4.2 -org.onap.appc,appc-dmaap-adapter-bundle,1.4.2 -org.onap.appc,appc-event-listener-bundle,1.4.2 -org.onap.appc,appc-iaas-adapter-bundle,1.4.2 -org.onap.appc,appc-license-manager-api,1.4.2 -org.onap.appc,appc-license-manager-core,1.4.2 -org.onap.appc,appc-lifecycle-management-api,1.4.2 -org.onap.appc,appc-lifecycle-management-core,1.4.2 -org.onap.appc,appc-message-adapter-api,1.4.2 -org.onap.appc,appc-message-adapter-factory,1.4.2 -org.onap.appc,appc-metric-bundle,1.4.2 -org.onap.appc,appc-netconf-adapter-bundle,1.4.2 -org.onap.appc,appc-network-inventory-client-provider,1.4.2 -org.onap.appc,appc-oam-bundle,1.4.2 -org.onap.appc,appc-provider-bundle,1.4.2 -org.onap.appc,appc-ranking-framework-lib,1.4.2 -org.onap.appc,appc-request-handler-api,1.4.2 -org.onap.appc,appc-request-handler-core,1.4.2 -org.onap.appc,appc-rest-adapter-bundle,1.4.2 -org.onap.appc,appc-rest-healthcheck-adapter-bundle,1.4.2 -org.onap.appc,appc-sdc-listener-bundle,1.4.2 -org.onap.appc,appc-sequence-generator-bundle,1.4.2 -org.onap.appc,appc-ssh-adapter-api,1.4.2 -org.onap.appc,appc-ssh-adapter-sshd,1.4.2 -org.onap.appc,appc-ssh-adapter-tests,1.4.2 -org.onap.appc,appc-workflow-management-api,1.4.2 -org.onap.appc,appc-workflow-management-core,1.4.2 -org.onap.appc,appc-yang-generator,1.4.2 -org.onap.appc,execution-queue-management-lib,1.4.2 -org.onap.appc,lock-manager-api,1.4.2 -org.onap.appc,lock-manager-impl,1.4.2 -org.onap.appc,state-machine-lib,1.4.2 -org.onap.appc,transaction-recorder,1.4.2 -org.onap.appc.cdt,cdt-proxy-service,1.4.2 -org.onap.appc.cdt,config-design-tool,1.4.2 -org.onap.appc.client,client-kit,1.4.2 -org.onap.appc.client,client-lib,1.4.2 -org.onap.appc.client,client-simulator,1.4.2 -org.onap.appc.client,code-generator,1.4.2 -org.onap.appc.plugins,dg-loader-provider,1.4.2 +org.onap.appc,appc-aai-client-provider,1.4.3 +org.onap.appc,appc-ansible-adapter-bundle,1.4.3 +org.onap.appc,appc-artifact-handler-provider,1.4.3 +org.onap.appc,appc-chef-adapter-bundle,1.4.3 +org.onap.appc,appc-command-executor-api,1.4.3 +org.onap.appc,appc-command-executor-core,1.4.3 +org.onap.appc,appc-common,1.4.3 +org.onap.appc,appc-config-adaptor-provider,1.4.3 +org.onap.appc,appc-config-audit-provider,1.4.3 +org.onap.appc,appc-config-data-services-provider,1.4.3 +org.onap.appc,appc-config-encryption-tool-provider,1.4.3 +org.onap.appc,appc-config-flow-controller-provider,1.4.3 +org.onap.appc,appc-config-generator-provider,1.4.3 +org.onap.appc,appc-config-params-provider,1.4.3 +org.onap.appc,appc-data-access-lib,1.4.3 +org.onap.appc,appc-design-services-provider,1.4.3 +org.onap.appc,appc-dg-aai,1.4.3 +org.onap.appc,appc-dg-common,1.4.3 +org.onap.appc,appc-dg-license-manager,1.4.3 +org.onap.appc,appc-dg-mdsal-store,1.4.3 +org.onap.appc,appc-dg-netconf,1.4.3 +org.onap.appc,appc-dg-provider,1.4.3 +org.onap.appc,appc-dg-ssh,1.4.3 +org.onap.appc,appc-dg-util-bundle,1.4.3 +org.onap.appc,appc-dmaap-adapter-bundle,1.4.3 +org.onap.appc,appc-event-listener-bundle,1.4.3 +org.onap.appc,appc-iaas-adapter-bundle,1.4.3 +org.onap.appc,appc-license-manager-api,1.4.3 +org.onap.appc,appc-license-manager-core,1.4.3 +org.onap.appc,appc-lifecycle-management-api,1.4.3 +org.onap.appc,appc-lifecycle-management-core,1.4.3 +org.onap.appc,appc-message-adapter-api,1.4.3 +org.onap.appc,appc-message-adapter-factory,1.4.3 +org.onap.appc,appc-metric-bundle,1.4.3 +org.onap.appc,appc-netconf-adapter-bundle,1.4.3 +org.onap.appc,appc-network-inventory-client-provider,1.4.3 +org.onap.appc,appc-oam-bundle,1.4.3 +org.onap.appc,appc-provider-bundle,1.4.3 +org.onap.appc,appc-ranking-framework-lib,1.4.3 +org.onap.appc,appc-request-handler-api,1.4.3 +org.onap.appc,appc-request-handler-core,1.4.3 +org.onap.appc,appc-rest-adapter-bundle,1.4.3 +org.onap.appc,appc-rest-healthcheck-adapter-bundle,1.4.3 +org.onap.appc,appc-sdc-listener-bundle,1.4.3 +org.onap.appc,appc-sequence-generator-bundle,1.4.3 +org.onap.appc,appc-ssh-adapter-api,1.4.3 +org.onap.appc,appc-ssh-adapter-sshd,1.4.3 +org.onap.appc,appc-ssh-adapter-tests,1.4.3 +org.onap.appc,appc-workflow-management-api,1.4.3 +org.onap.appc,appc-workflow-management-core,1.4.3 +org.onap.appc,appc-yang-generator,1.4.3 +org.onap.appc,execution-queue-management-lib,1.4.3 +org.onap.appc,lock-manager-api,1.4.3 +org.onap.appc,lock-manager-impl,1.4.3 +org.onap.appc,state-machine-lib,1.4.3 +org.onap.appc,transaction-recorder,1.4.3 +org.onap.appc.cdt,cdt-proxy-service,1.4.3 +org.onap.appc.cdt,config-design-tool,1.4.3 +org.onap.appc.client,client-kit,1.4.3 +org.onap.appc.client,client-lib,1.4.3 +org.onap.appc.client,client-simulator,1.4.3 +org.onap.appc.client,code-generator,1.4.3 +org.onap.appc.plugins,dg-loader-provider,1.4.3 org.onap.ccsdk.parent,binding-parent,1.1.1 org.onap.ccsdk.parent,bundle-parent,1.1.1 org.onap.ccsdk.parent,feature-repo-parent,1.1.1 @@ -195,8 +196,8 @@ org.onap.dcaegen2.services.prh,prh-aai-client,1.1.1 org.onap.dcaegen2.services.prh,prh-app-server,1.1.1 org.onap.dcaegen2.services.prh,prh-commons,1.1.1 org.onap.dcaegen2.services.prh,prh-dmaap-client,1.1.1 -org.onap.dmaap.datarouter.datarouter-node,1.0.3 -org.onap.dmaap.datarouter.datarouter-prov,1.0.3 +org.onap.dmaap.datarouter.datarouter-node,1.0.6 +org.onap.dmaap.datarouter.datarouter-prov,1.0.6 org.onap.dmaap.messagerouter.dmaapclient,dmaapClient,1.0.0 org.onap.dmaap.messagerouter.messageservice,dmaapMR1,1.0.1 org.onap.dmaap.messagerouter.mirroragent,dmaapMMAgent,1.0.0 @@ -217,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 @@ -242,23 +243,23 @@ org.onap.sdc.jtosca,jtosca,1.4.5 org.onap.sdc.sdc-distribution-client,sdc-distribution-client,1.3.0 org.onap.sdc.sdc-titan-cassandra,sdc-titan-cassandra,1.2.0 org.onap.sdc.sdc-tosca,sdc-tosca,1.4.6 -org.onap.sdnc.northbound,generic-resource-api.provider,1.4.1 -org.onap.sdnc.northbound,vnfapi-provider,1.4.1 -org.onap.sdnc.northbound,vnftools-provider,1.4.1 +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 |