diff options
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rwxr-xr-x | docs/docs_vFWDT.rst | 181 | ||||
| -rwxr-xr-x | docs/files/cdt-request-input.xlsx | bin | 404790 -> 305766 bytes | |||
| -rw-r--r-- | version-manifest/src/main/resources/docker-manifest-staging.csv | 26 | ||||
| -rw-r--r-- | version-manifest/src/main/resources/docker-manifest.csv | 30 | ||||
| -rw-r--r-- | version-manifest/src/main/resources/java-manifest.csv | 6 |
6 files changed, 122 insertions, 122 deletions
diff --git a/.gitattributes b/.gitattributes index 46526f6ac..3185c448b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ * text=auto eol=lf *.png binary *.jpg binary +*.xlsx binary diff --git a/docs/docs_vFWDT.rst b/docs/docs_vFWDT.rst index b12d80a04..16e6bbd2c 100755 --- a/docs/docs_vFWDT.rst +++ b/docs/docs_vFWDT.rst @@ -68,7 +68,7 @@ vFWDT Instantiation In order to test a DistributeTraffic LCM API functionality a dedicated vFW instance must be prepared. It differs from a standard vFW instance by having an additional VF-module with a second instance of vFW and a second instance of vSINK. Thanks to that when a service instance is deployed there are already available two instances of vFW and vSINK that can be used for verification of DistributeTraffic LCM API – there is no need to use the ScaleOut function to test DistributeTraffic functionality what simplifies preparations for tests. -In order to instantiate vFWDT please follow the procedure for standard vFW with following changes: +In order to instantiate vFWDT service please follow the procedure for standard vFW with following changes: 1. Please use the following HEAT templates: @@ -96,95 +96,12 @@ https://github.com/onap/demo/tree/master/heat/vFWDT :scale: 20 % :align: center - Figure 4 Configuration of networks for vFWDT - -Configuration of Ansible Server -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -After an instantiation of the vFWDT service the Ansible server must be configured in order to allow it a reconfiguration of vPKG VM. - -1. Enter the Ansible Server container - -2. Install nano and wget - -:: - - apt install wget nano - -3. Download the distribute traffic playbook into the :file:`/opt/onap/ccsdk/Playbooks` directory - -:: - - cd /opt/onap/ccsdk/Playbooks - - wget https://raw.githubusercontent.com/onap/appc-deployment/master/playbook/ansible_vfw_distributetraffic%400.00.yml - -4. Change with *nano* the *hosts: all* statement in the playbook into the *hosts: vpkg-1* statement - -5. Copy a private key file used for VMs' creation into the :file:`/opt/onap/ccsdk/Playbooks/vpkg-1.pem` file and give it proper rights - -:: - - chown 400 vpkg-1.pem - -.. note:: The private key file must be related with a public key specified in the *pub_key* statement used in the *SDNC-Preloading* phase - -6. Edit the :file:`/opt/onap/ccsdk/Playbooks/Ansible\ \_\ inventory` file including *vpkg-1* host - -:: - - [vpkg-1] - vpkg-1 ansible_ssh_host=10.0.110.2 ansible_ssh_user=ubuntu - ansible_ssh_private_key_file=/opt/onap/ccsdk/Playbooks/vpkg-1.pem - -.. note:: Change IP address respectively - -7. Test that the Ansible server can access *vpkg-1* host over ssh - -:: - - ansible –i Ansible_inventory vpkg-1 –m ping - -8. Upload the payload file :file:`/opt/onap/ccsdk/Playbooks/config.json` with extra parameters for the Ansible playbook. - -:: - - { - "fwIp": "192.168.10.110", - "sinkIp": "192.168.20.240" - } - -.. note:: This step can be omitted when the CDT template file for the *DistributeTraffic* action will be formulated in a different way. In consequence all the parameters required by a playbook can be defined directly on the CDT level and there is no need to maintain this file. For our VNF this file contains an IP address of vFW 2 from the *unprotected* network and an IP address of vSINK 2 from the *protected* network. - -Configuration of MySQL/MariaDB for Ansible -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -For each VNF that uses the Ansible protocol you need to configure *PASSWORD* and *URL* field* in the *DEVICE_AUTHENTICATION* table. - -1. Enter the MariaDB container - -2. Enter the Maria DB CLI (password is *gamma*) - -:: - - mysql -u sdnctl -p - -3. Invoke the following commands - -:: - - MariaDB [(none)]> use sdnctl; - MariaDB [sdnctl]> select * from DEVICE_AUTHENTICATION; - MariaDB [sdnctl]> UPDATE DEVICE_AUTHENTICATION SET URL = 'http://ansiblehost:8000/Dispatch' WHERE DEVICE_AUTHENTICATION_ID=51; - MariaDB [sdnctl]> UPDATE DEVICE_AUTHENTICATION SET PASSWORD = 'admin' WHERE DEVICE_AUTHENTICATION_ID=51; - - -.. note:: You need to find in the *select* query result ID of row that has VNF Type like the one specified in the CDT, *DistributeTraffic* as an action name and *Ansible* as a name of a protocol. You should replace *ansiblehost* with an IP or a hostname of the Ansible Server reachable for the APPC container. + Figure 4 Configuration of networks for vFWDT service Configuration of VNF in the APPC CDT tool ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Following steps aim to configure DistributeTraffic LCM action for our vFW VNF in APPC CDT tool. +Following steps aim to configure DistributeTraffic LCM action for our vPKG VNF in APPC CDT tool. 1. Enter the Controller Design Tool page: http://appc_ip:CDT_port @@ -237,7 +154,7 @@ Following steps aim to configure DistributeTraffic LCM action for our vFW VNF in :: { - "PlaybookName": "ansible_vfw_distributetraffic@400.00.yml", + "PlaybookName": "ansible_vfw_distributetraffic@0.00.yml", "NodeList": ["vpkg-1"], "EnvParameters": { "ConfigFileName": "config.json" @@ -255,7 +172,7 @@ The *EnvParameters* group contains all the parameters that will be passed direct Figure 9 Request template file after uploading -Select *ansible_vfw_distributetraffic@400.00.yml* and press CTRL+4 buttons. The new dialog window will appear. Enter a name *playbook* for this value and press the *Submit* button. +Select *ansible_vfw_distributetraffic@0.00.yml* and press CTRL+4 buttons. The new dialog window will appear. Enter a name *playbook* for this value and press the *Submit* button. .. figure:: files/figure10.png :scale: 60 % @@ -281,6 +198,88 @@ Afterwards press the *SYNCHRONIZE WITH TEMPLATE PARAMETERS* button. You will be Finally, go back to the *Reference Data* tab and click *SAVE ALL TO APPC*. +Configuration of Ansible Server +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +After an instantiation of the vFWDT service the Ansible server must be configured in order to allow it a reconfiguration of vPKG VM. + +1. Enter the Ansible Server container + +2. Install nano and wget + +:: + + apt install wget nano + +3. Download the distribute traffic playbook into the :file:`/opt/onap/ccsdk/Playbooks` directory + +:: + + cd /opt/onap/ccsdk/Playbooks + + wget https://raw.githubusercontent.com/onap/appc-deployment/master/playbook/ansible_vfw_distributetraffic%400.00.yml + +4. Change with *nano* the *hosts: all* statement in the playbook into the *hosts: vpkg-1* statement + +5. Copy a private key file used for VMs' creation into the :file:`/opt/onap/ccsdk/Playbooks/vpkg-1.pem` file and give it proper rights + +:: + + chmod 400 vpkg-1.pem + +.. note:: The private key file must be related with a public key specified in the *pub_key* statement used in the *SDNC-Preloading* phase + +6. Edit the :file:`/opt/onap/ccsdk/Playbooks/Ansible\ \_\ inventory` file including *vpkg-1* host + +:: + + [vpkg-1] + vpkg-1 ansible_ssh_host=10.0.110.2 ansible_ssh_user=ubuntu ansible_ssh_private_key_file=/opt/onap/ccsdk/Playbooks/vpkg-1.pem + +.. note:: Change IP address respectively + +7. Test that the Ansible server can access *vpkg-1* host over ssh + +:: + + ansible –i Ansible_inventory vpkg-1 –m ping + +8. Upload the payload file :file:`/opt/onap/ccsdk/Playbooks/config.json` with extra parameters for the Ansible playbook. + +:: + + { + "fwIp": "192.168.10.110", + "sinkIp": "192.168.20.240" + } + +.. note:: This step can be omitted when the CDT template file for the *DistributeTraffic* action will be formulated in a different way. In consequence all the parameters required by a playbook can be defined directly on the CDT level and there is no need to maintain this file. For our VNF this file contains an IP address of vFW 2 from the *unprotected* network and an IP address of vSINK 2 from the *protected* network. + +Configuration of MySQL/MariaDB for Ansible +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +For each VNF that uses the Ansible protocol you need to configure *PASSWORD* and *URL* field* in the *DEVICE_AUTHENTICATION* table. + +1. Enter the MariaDB container + +2. Enter the Maria DB CLI (password is *gamma*) + +:: + + mysql -u sdnctl -p + +3. Invoke the following commands + +:: + + MariaDB [(none)]> use sdnctl; + MariaDB [sdnctl]> select * from DEVICE_AUTHENTICATION; + MariaDB [sdnctl]> UPDATE DEVICE_AUTHENTICATION SET URL = 'http://ansiblehost:8000/Dispatch' WHERE DEVICE_AUTHENTICATION_ID=51; + MariaDB [sdnctl]> UPDATE DEVICE_AUTHENTICATION SET PASSWORD = 'admin' WHERE DEVICE_AUTHENTICATION_ID=51; + + +.. note:: You need to find in the *select* query result ID of row that has VNF Type like the one specified in the CDT, *DistributeTraffic* as an action name and *Ansible* as a name of a protocol. You should replace *ansiblehost* with an IP or a hostname of the Ansible Server reachable for the APPC container. + Testing DistributeTraffic LCM API --------------------------------- @@ -289,7 +288,7 @@ Below we propose three different ways to test DistributeTraffic LCM API. Test in CDT ~~~~~~~~~~~ -In order to test API in CDT go to *TEST* tab. Upload spreadsheet (Excel file) and enter VNF ID of vFWDT VNF. +In order to test API in CDT go to *TEST* tab. Upload spreadsheet (Excel file) and enter VNF ID of vPKG VNF. :download:`CDT request input <files/cdt-request-input.xlsx>` @@ -335,7 +334,7 @@ Another way to test API is to use APIDOC explorer of APPC that comes with OpenDa "action-identifiers": { "vnf-id": "2bd5cc6e-9738-436f-b5a8-c1a749a89f52" }, - "payload": "{\"configuration-parameters\":{\"ConfigFileName\":\ "/opt/onap/ccsdk/Playbooks/dt-vpkg-1-config.json\",\"playbook\":\"ansible_vfw_distributetraffic@400.00.yml\",\"node_list\":\"[vpkg-1]\"}}" + "payload": "{\"configuration-parameters\":{\"ConfigFileName\":\ "/opt/onap/ccsdk/Playbooks/dt-vpkg-1-config.json\",\"playbook\":\"ansible_vfw_distributetraffic@0.00.yml\",\"node_list\":\"[vpkg-1]\"}}" } } @@ -381,7 +380,7 @@ POST request to DMaaP requires that *payload* data is specific to a APPC LCM req "body": { "input": { "action": "DistributeTraffic", - "payload": "{\"configuration-parameters\":{\"ConfigFileName\":\"/opt/onap/ccsdk/Playbooks/dt-vpkg-1-config.json\",\"playbook\":\"ansible_vfw_distributetraffic@400.00.yml\",\"node_list\":\"[vpkg-1]\"}}", + "payload": "{\"configuration-parameters\":{\"ConfigFileName\":\"/opt/onap/ccsdk/Playbooks/dt-vpkg-1-config.json\",\"playbook\":\"ansible_vfw_distributetraffic@0.00.yml\",\"node_list\":\"[vpkg-1]\"}}", "common-header": { "api-ver": "2.00", "timestamp": "2018-10-22T11:11:25.244Z", diff --git a/docs/files/cdt-request-input.xlsx b/docs/files/cdt-request-input.xlsx Binary files differindex 2d3498543..d0c4ec992 100755 --- a/docs/files/cdt-request-input.xlsx +++ b/docs/files/cdt-request-input.xlsx diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv index d2805304b..3726b36f0 100644 --- a/version-manifest/src/main/resources/docker-manifest-staging.csv +++ b/version-manifest/src/main/resources/docker-manifest-staging.csv @@ -105,18 +105,18 @@ onap/portal-db,2.3.1 onap/portal-sdk,2.3.1 onap/portal-wms,2.3.1 onap/rproxy,2.1-STAGING-latest -onap/sdc-api-tests,1.3.5 -onap/sdc-backend,1.3.5 -onap/sdc-backend-init,1.3.5 -onap/sdc-cassandra,1.3.5 -onap/sdc-cassandra-init,1.3.5 -onap/sdc-elasticsearch,1.3.5 -onap/sdc-frontend,1.3.5 -onap/sdc-init-elasticsearch,1.3.5 -onap/sdc-kibana,1.3.5 -onap/sdc-onboard-backend,1.3.5 -onap/sdc-onboard-cassandra-init,1.3.5 -onap/sdc-ui-tests,1.3.5 +onap/sdc-api-tests,1.3.6 +onap/sdc-backend,1.3.6 +onap/sdc-backend-init,1.3.6 +onap/sdc-cassandra,1.3.6 +onap/sdc-cassandra-init,1.3.6 +onap/sdc-elasticsearch,1.3.6 +onap/sdc-frontend,1.3.6 +onap/sdc-init-elasticsearch,1.3.6 +onap/sdc-kibana,1.3.6 +onap/sdc-onboard-backend,1.3.6 +onap/sdc-onboard-cassandra-init,1.3.6 +onap/sdc-ui-tests,1.3.6 onap/sdnc-ansible-server-image,1.4.4 onap/sdnc-dmaap-listener-image,1.4.4 onap/sdnc-image,1.4.4 @@ -135,7 +135,7 @@ onap/so/so-monitoring,1.3.6 onap/so/vfc-adapter,1.3.6 onap/sparky-be,1.3.0 onap/spike,1.3.1 -onap/testsuite,1.3.3-STAGING-latest +onap/testsuite,1.3.3 onap/tproxy-config,2.1-STAGING-latest onap/usecase-ui,1.2.2 onap/usecase-ui-server,1.2.1 diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index ae7b8ce39..af40da407 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -15,7 +15,7 @@ onap/aaf/sms,3.0.1 onap/aaf/smsquorumclient,3.0.1 onap/aaf/testcaservice,3.0.0 onap/aai-cacher,1.0.0 -onap/aai-graphadmin,1.0.3 +onap/aai-graphadmin,1.0.4 onap/aai-resources,1.3.5 onap/aai-traversal,1.3.4 onap/aai/esr-gui,1.2.1 @@ -36,7 +36,7 @@ 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.2 +onap/data-router,1.3.3 onap/dcae-be,1.3.0 onap/dcae-dt,1.2.0 onap/dcae-fe,1.3.0 @@ -103,18 +103,18 @@ 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-api-tests,1.3.5 -onap/sdc-backend,1.3.5 -onap/sdc-backend-init,1.3.5 -onap/sdc-cassandra,1.3.5 -onap/sdc-cassandra-init,1.3.5 -onap/sdc-elasticsearch,1.3.5 -onap/sdc-frontend,1.3.5 -onap/sdc-init-elasticsearch,1.3.5 -onap/sdc-kibana,1.3.5 -onap/sdc-onboard-backend,1.3.5 -onap/sdc-onboard-cassandra-init,1.3.5 -onap/sdc-ui-tests,1.3.5 +onap/sdc-api-tests,1.3.6 +onap/sdc-backend,1.3.6 +onap/sdc-backend-init,1.3.6 +onap/sdc-cassandra,1.3.6 +onap/sdc-cassandra-init,1.3.6 +onap/sdc-elasticsearch,1.3.6 +onap/sdc-frontend,1.3.6 +onap/sdc-init-elasticsearch,1.3.6 +onap/sdc-kibana,1.3.6 +onap/sdc-onboard-backend,1.3.6 +onap/sdc-onboard-cassandra-init,1.3.6 +onap/sdc-ui-tests,1.3.6 onap/sdnc-ansible-server-image,1.4.4 onap/sdnc-dmaap-listener-image,1.4.4 onap/sdnc-image,1.4.4 @@ -133,7 +133,7 @@ onap/so/so-monitoring,1.3.7 onap/so/vfc-adapter,1.3.7 onap/sparky-be,1.3.2 onap/spike,1.3.1 -onap/testsuite,1.3.2 +onap/testsuite,1.3.3 onap/usecase-ui,1.2.2 onap/usecase-ui-server,1.2.1 onap/validation,1.3.1 diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index 3b4491a76..2d3fb1a9e 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -34,7 +34,7 @@ org.onap.aai.aai-common,aai-utils,1.3.5 org.onap.aai.babel,babel,1.3.3 org.onap.aai.cacher,cacher,1.0.1 org.onap.aai.champ,champ,1.3.1 -org.onap.aai.data-router,data-router,1.3.2 +org.onap.aai.data-router,data-router,1.3.3 org.onap.aai.esr-gui,aai-esr-gui,1.2.2 org.onap.aai.esr-gui,common,1.2.2 org.onap.aai.esr-gui,distribution,1.2.2 @@ -48,7 +48,7 @@ org.onap.aai.event-client,event-client-api,1.3.2 org.onap.aai.event-client,event-client-dmaap,1.3.2 org.onap.aai.event-client,event-client-kafka,1.3.2 org.onap.aai.gizmo,gizmo,1.3.2 -org.onap.aai.graphadmin,graphadmin,1.0.2 +org.onap.aai.graphadmin,graphadmin,1.0.4 org.onap.aai.logging-service,common-logging,1.3.1 org.onap.aai.logging-service,eelf-logging,1.3.1 org.onap.aai.logging-service,logging-api,1.3.1 @@ -252,7 +252,7 @@ org.onap.portal.sdk,epsdk-workflow,2.4.0 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.sdc.sdc-tosca,sdc-tosca,1.4.63 org.onap.sdnc.northbound,generic-resource-api.provider,1.4.3 org.onap.sdnc.northbound,vnfapi-provider,1.4.3 org.onap.sdnc.northbound,vnftools-provider,1.4.3 |