From 906480b1b28446660b4a65f249ddf6722fc8b7e6 Mon Sep 17 00:00:00 2001 From: zhaoliping123 Date: Wed, 22 Apr 2020 11:52:56 +0800 Subject: Add vcpe tosca local mode case - fix json errors - fix not related rst error (due to a broken link as jira.opnfv.org is no more responding) Issue-ID: INT-1285 Change-Id: I733a491c4204334fc532abcf9dbbdc2226900d5b Signed-off-by: zhaoliping123 Signed-off-by: mrichomme --- docs/docs_5g_pnf_pnp.rst | 6 +- docs/docs_usecases.rst | 2 + docs/docs_vCPE_tosca_local.rst | 178 ++++++++++++++++++++++++++ docs/docs_vCPE_with_Tosca_VNF.rst | 2 +- docs/docs_vFWDT.rst | 0 docs/files/vcpe_tosca/create_image.png | Bin 0 -> 32427 bytes docs/files/vcpe_tosca/create_project.png | Bin 0 -> 121527 bytes docs/files/vcpe_tosca/create_user.png | Bin 0 -> 92034 bytes docs/files/vcpe_tosca/image.png | Bin 0 -> 36508 bytes docs/files/vcpe_tosca/manage_project_user.png | Bin 0 -> 59063 bytes 10 files changed, 184 insertions(+), 4 deletions(-) create mode 100644 docs/docs_vCPE_tosca_local.rst mode change 100755 => 100644 docs/docs_vFWDT.rst create mode 100644 docs/files/vcpe_tosca/create_image.png create mode 100644 docs/files/vcpe_tosca/create_project.png create mode 100644 docs/files/vcpe_tosca/create_user.png create mode 100644 docs/files/vcpe_tosca/image.png create mode 100644 docs/files/vcpe_tosca/manage_project_user.png (limited to 'docs') diff --git a/docs/docs_5g_pnf_pnp.rst b/docs/docs_5g_pnf_pnp.rst index a81cca571..c804cf276 100644 --- a/docs/docs_5g_pnf_pnp.rst +++ b/docs/docs_5g_pnf_pnp.rst @@ -26,8 +26,8 @@ The PNF Plug and Play is a procedure that is executed between a PNF and ONAP. In How to Use ~~~~~~~~~~ -1) `Create and distribute service model which contains PNF -2) `Create service for PNF and wait for PNF Ready message in DmaaP topic -3) `Send PNF Registartion request from PnP PNF Simualtor and finish registration +1) Create and distribute service model which contains PNF +2) Create service for PNF and wait for PNF Ready message in DmaaP topic +3) Send PNF Registartion request from PnP PNF Simualtor and finish registration See `_ for details. diff --git a/docs/docs_usecases.rst b/docs/docs_usecases.rst index 4dfd75b96..6eccb59d9 100644 --- a/docs/docs_usecases.rst +++ b/docs/docs_usecases.rst @@ -37,6 +37,8 @@ Use Cases :ref:`vFirewall CNF (Container Network Function) With CDS Use Case ` +:ref:`vCPE Tosca Local Mode Use Case ` + Functional Requirements ~~~~~~~~~~~~~~~~~~~~~~~ :ref:`5G - Real Time PM and High Volume Stream Data Collection ` diff --git a/docs/docs_vCPE_tosca_local.rst b/docs/docs_vCPE_tosca_local.rst new file mode 100644 index 000000000..40ee8562b --- /dev/null +++ b/docs/docs_vCPE_tosca_local.rst @@ -0,0 +1,178 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 + International License. http://creativecommons.org/licenses/by/4.0 + Copyright 2020 CMCC Technologies Co., Ltd. All rights reserved. + +.. _docs_vcpe_tosca_local: + +vCPE Tosca Local Mode Use Case +------------------------------ + +Description +~~~~~~~~~~~ +vCPE tosca use case is based on Network Enhanced Residential Gateway architecture specified in Technical Report 317 (TR-317), which defines how service providers deploy residential broadband services like High Speed Internet Access. The use case implementation has infrastructure services and customer service. The common infrastructure services are deployed first and shared by all customers. The use case demonstrates ONAP capabilities to design, deploy, configure and control sophisticated services. + +More details on the vCPE Use Case can be found on wiki page https://wiki.onap.org/pages/viewpage.action?pageId=3246168 + +Local is the way how to distribute the network elements. Here we use local means we want upload the csar file to distribute the vnf and ns configurations. + +Source Code +~~~~~~~~~~~ +vcpe tosca local test scripts: https://git.onap.org/integration/tree/test + +How to Use +~~~~~~~~~~ +The use case has been automated by vcpe_tosca_test scripts. The followings are the main steps to run the use case in Integration lab environment: + +1) Install ONAP CLI environment, open_cli_product is onap-elalto. + + +2) Prepare openstack test environment. + + * Create project(tenant) and user on openstack + + Openstack Horizon--Identity--Projects page + + .. image:: files/vcpe_tosca/create_project.png + + Openstack Horizon--Identity--Users page + + .. image:: files/vcpe_tosca/create_user.png + + Manage Project Members + + .. image:: files/vcpe_tosca/manage_project_user.png + + * Create and upload image for VNF + + Identify the version of the lab server, my lab server is Ubuntu 16.04.3 LTS. + + :: + + root@onap-dengyuanhong-master:~# cat /etc/lsb-release + DISTRIB_ID=Ubuntu + DISTRIB_RELEASE=16.04 + DISTRIB_CODENAME=xenial + DISTRIB_DESCRIPTION="Ubuntu 16.04.3 LTS" + + + Download the related ubuntu image from https://cloud-images.ubuntu.com/ + + .. image:: files/vcpe_tosca/image.png + + Openstack Horizon--Project--Compute--Images page, create an image named image, the name must be the same with image which is defined in vnf csar file. + + .. image:: files/vcpe_tosca/create_image.png + +3) Update the configuration file vcpe_config.json under https://git.onap.org/integration/tree/test + + You should update the values if you want to run in your environment. + + Firstly, identify the Region name you used on your openstack environment, our Region name is RegionOne, it will be used by the configuration file. + + :: + + [wrsroot@controller-0 ~(keystone_admin)]$ openstack region list + +-----------+---------------+-------------+ + | Region | Parent Region | Description | + +-----------+---------------+-------------+ + | RegionOne | None | | + +-----------+---------------+-------------+ + + + Secondly, update the values according to your environment. + + :: + + "open_cli_home": set to the oclip home path, + "aai_url": set to msb ip and port you used, + "msb_url": set to msb ip and port you used, + "multicloud_url": set to msb ip and port you used, + + "cloud_region_data": { + "RegionOne":(update to your Region name) { + "cloud-region-version": "titanium_cloud", + "esr-system-info-id": "1111ce1f-aa78-4ebf-8d6f-4b62773e9b01", + "service-url": the ip change to your openstack ip address, + "user-name": the user name you created on openstack, + "password": the user password you created on openstack, + "system-type": "VIM", + "ssl-insecure": true, + "cloud-domain": "Default", + "default-tenant": the project name you created on openstack, + "tenant-id": the project id you created on openstack, + "cloud-type": "openstack", + "identity-url": the ip change to your openstack ip address, + "system-status": "active" + } + } + "vfc-url": set to msb ip and port you used, + "vnfs": { + "vgw": { + "path": "vgw.csar", set to your vnf csar file path + "key": "key2", + "value": "value2" + } + }, + "ns": { + "key": "key1", + "value": "value1", + "path": "ns_vgw.csar", set to you ns csar file path + "name": "vcpe11" + }, + "location": "VCPE22_RegionOne", set to CloudOwner_CloudRegion + "vnfm_params": { + "GVNFMDRIVER": { + "type": "gvnfmdriver", + "vendor": "vfc", + "version": "v1.0", + "url": set to msb ip and port you used, + "vim-id": "VCPE22_RegionOne", set to CloudOwner_CloudRegion + "user-name": "admin", + "user-password": "admin", + "vnfm-version": "v1.0" + } + } + + +4) The vnf csar file include Infra, vGW, vBNG, vBRGEMU and vGMUX, and the ns csar file is ns. https://git.onap.org/integration/tree/test + + +5) The key test script is vcpe_tosca_test.py which is under https://git.onap.org/integration/tree/test + + Run command is + + :: + + python3 -m unittest vcpe_tosca_test.py + + Before run the command, you should install requests: pip install requests, and update the path of configuration file vcpe_config.json. + +5) Release of our environment + + :: + + vfc-nslcm: 1.3.8 + vfc-vnflcm: 1.3.8 + vfc-gvnfm: 1.3.8 + modeling-etsicatalog: 1.0.5 + multicloud-framework: 1.5.1 + multicloud-windriver: 1.5.5 + cli: onap-elalto + + +Note +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +1) You should create an image named image before running the test script, the name must be the same with image which is defined in vnf csar file. + +2) There are something wrong if you use the cli dublin, so please use elalto instead. + + +Known Issues and Workaround +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +1) There is time out issue when terminating vnf, the solution is refer to + + https://gerrit.onap.org/r/c/vfc/nfvo/driver/vnfm/gvnfm/+/105192 + +2) The process of terminating job is chaotic, the solution is refer to + + https://gerrit.onap.org/r/c/vfc/nfvo/lcm/+/105449 diff --git a/docs/docs_vCPE_with_Tosca_VNF.rst b/docs/docs_vCPE_with_Tosca_VNF.rst index a62001fc7..69db4de34 100644 --- a/docs/docs_vCPE_with_Tosca_VNF.rst +++ b/docs/docs_vCPE_with_Tosca_VNF.rst @@ -137,7 +137,7 @@ Known Issues and Resolutions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 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. +- NFV Tosca parser bug. See 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/73332/ is not accepted by 1.2.4 image. 1.2.5 is available in nexus3 repo. But not available in Casablanca 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. - vnflcm notification error patch https://gerrit.onap.org/r/73852/ diff --git a/docs/docs_vFWDT.rst b/docs/docs_vFWDT.rst old mode 100755 new mode 100644 diff --git a/docs/files/vcpe_tosca/create_image.png b/docs/files/vcpe_tosca/create_image.png new file mode 100644 index 000000000..44b226231 Binary files /dev/null and b/docs/files/vcpe_tosca/create_image.png differ diff --git a/docs/files/vcpe_tosca/create_project.png b/docs/files/vcpe_tosca/create_project.png new file mode 100644 index 000000000..814e4089d Binary files /dev/null and b/docs/files/vcpe_tosca/create_project.png differ diff --git a/docs/files/vcpe_tosca/create_user.png b/docs/files/vcpe_tosca/create_user.png new file mode 100644 index 000000000..800247a94 Binary files /dev/null and b/docs/files/vcpe_tosca/create_user.png differ diff --git a/docs/files/vcpe_tosca/image.png b/docs/files/vcpe_tosca/image.png new file mode 100644 index 000000000..05ac77290 Binary files /dev/null and b/docs/files/vcpe_tosca/image.png differ diff --git a/docs/files/vcpe_tosca/manage_project_user.png b/docs/files/vcpe_tosca/manage_project_user.png new file mode 100644 index 000000000..3deb7b05b Binary files /dev/null and b/docs/files/vcpe_tosca/manage_project_user.png differ -- cgit 1.2.3-korg