diff options
| author |   Haibin Huang <haibin.huang@intel.com> | 2019-06-04 14:36:28 +0800 |
|---|---|---|
| committer | Haibin Huang <haibin.huang@intel.com> | 2019-06-06 11:28:21 +0800 |
| commit | 3657ff330adc9580e1e01470d02a7d660d43701e (patch) | |
| tree | a2573234df675b6f78f5fd06097185b5a336468f /products | |
| parent | 3b737178f4c3f41579eb0663f53202251df60c93 (diff) | |
Add ns termination
Issue-ID: CLI-149
Change-Id: Ie82c7392570754ef30d4a234d63ffb2faf90a037
Signed-off-by: Haibin Huang <haibin.huang@intel.com>
Diffstat (limited to 'products')
16 files changed, 582 insertions, 47 deletions
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-create-ns-schema-moco.json b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-create-ns-schema-moco.json new file mode 100644 index 00000000..5bbc2613 --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-create-ns-schema-moco.json @@ -0,0 +1,28 @@ +[ { + "request" : { + "method" : "post", + "uri" : "/api/nsd/v1/ns_descriptors", + "headers" : { + "Accept" : "application/json", + "Content-Type" : "application/json" + }, + "json" : { + "userDefinedData" : { + "key1" : "value1" + } + } + }, + "response" : { + "status" : 201, + "json" : { + "id" : "cb847c7f-8c35-4b11-a42d-9535c512e08e", + "nsdOnboardingState" : "CREATED", + "nsdOperationalState" : "DISABLED", + "nsdUsageState" : "NOT_IN_USE", + "userDefinedData" : { + "key1" : "value1" + }, + "_links" : null + } + } +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-create-ns-schema-sample.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-create-ns-schema-sample.yaml new file mode 100644 index 00000000..9524d593 --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-create-ns-schema-sample.yaml @@ -0,0 +1,14 @@ +open_cli_sample_version: 1.0 +name: -m +version: onap-dublin +samples: + sample1: + name: -m + input: http://10.12.5.155:30280 -c key1 -e value1 + moco: vfc-catalog-create-ns-schema-moco.json + output: | + +--------------------------------------+----------+ + |id |state | + +--------------------------------------+----------+ + |cb847c7f-8c35-4b11-a42d-9535c512e08e |CREATED | + +--------------------------------------+----------+ diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-create-vnf-schema-moco.json b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-create-vnf-schema-moco.json new file mode 100644 index 00000000..9c4f4c55 --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-create-vnf-schema-moco.json @@ -0,0 +1,28 @@ +[ { + "request" : { + "method" : "post", + "uri" : "/api/vnfpkgm/v1/vnf_packages", + "headers" : { + "Accept" : "application/json", + "Content-Type" : "application/json" + }, + "json" : { + "userDefinedData" : { + "key2" : "value2" + } + } + }, + "response" : { + "status" : 201, + "json" : { + "id" : "763fc4d2-cc90-4534-9c27-460ca30754ff", + "onboardingState" : "CREATED", + "operationalState" : "DISABLED", + "usageState" : "NOT_IN_USE", + "userDefinedData" : { + "key2" : "value2" + }, + "_links" : null + } + } +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-create-vnf-schema-sample.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-create-vnf-schema-sample.yaml new file mode 100644 index 00000000..7b676323 --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-create-vnf-schema-sample.yaml @@ -0,0 +1,14 @@ +open_cli_sample_version: 1.0 +name: -m +version: onap-dublin +samples: + sample1: + name: -m + input: http://10.12.5.155:30280 -c key2 -e value2 + moco: vfc-catalog-create-vnf-schema-moco.json + output: | + +--------------------------------------+----------+ + |id |state | + +--------------------------------------+----------+ + |763fc4d2-cc90-4534-9c27-460ca30754ff |CREATED | + +--------------------------------------+----------+ diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-delete-ns-schema-moco.json b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-delete-ns-schema-moco.json new file mode 100644 index 00000000..85c8a81e --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-delete-ns-schema-moco.json @@ -0,0 +1,19 @@ +[ { + "request" : { + "method" : "delete", + "uri" : "/api/catalog/v1/nspackages/0480ba69-7904-4099-b2c3-b8167b4889b1", + "headers" : { + "Accept" : "application/json", + "Content-Type" : "application/json" + }, + "json" : { } + }, + "response" : { + "status" : 200, + "json" : { + "status" : "success", + "errorCode" : "", + "statusDescription" : "Delete CSAR(0480ba69-7904-4099-b2c3-b8167b4889b1) successfully." + } + } +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-delete-ns-schema-sample.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-delete-ns-schema-sample.yaml new file mode 100644 index 00000000..3abe96aa --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-delete-ns-schema-sample.yaml @@ -0,0 +1,14 @@ +open_cli_sample_version: 1.0 +name: -m +version: onap-dublin +samples: + sample1: + name: -m + input: http://10.12.5.155:30280 -c 0480ba69-7904-4099-b2c3-b8167b4889b1 + moco: vfc-catalog-delete-ns-schema-moco.json + output: | + +--------+ + |job-id | + +--------+ + | | + +--------+ diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-delete-vnf-schema-moco.json b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-delete-vnf-schema-moco.json new file mode 100644 index 00000000..febc5791 --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-delete-vnf-schema-moco.json @@ -0,0 +1,17 @@ +[ { + "request" : { + "method" : "delete", + "uri" : "/api/catalog/v1/vnfpackages/a8571488-d72d-4d9f-b534-4e7380390175", + "headers" : { + "Accept" : "application/json", + "Content-Type" : "application/json" + }, + "json" : { } + }, + "response" : { + "status" : 202, + "json" : { + "jobId" : "97eef170-174d-406d-b3c6-0516e21fbaf7" + } + } +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-delete-vnf-schema-sample.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-delete-vnf-schema-sample.yaml new file mode 100644 index 00000000..864d1ee8 --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-delete-vnf-schema-sample.yaml @@ -0,0 +1,14 @@ +open_cli_sample_version: 1.0 +name: -m +version: onap-dublin +samples: + sample1: + name: -m + input: http://10.12.5.155:30280 -c a8571488-d72d-4d9f-b534-4e7380390175 + moco: vfc-catalog-delete-vnf-schema-moco.json + output: | + +--------------------------------------+ + |job-id | + +--------------------------------------+ + |97eef170-174d-406d-b3c6-0516e21fbaf7 | + +--------------------------------------+ diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-ns-schema-moco.json b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-ns-schema-moco.json index 899b306d..462fc110 100644 --- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-ns-schema-moco.json +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-ns-schema-moco.json @@ -1,7 +1,7 @@ [ { "request" : { "method" : "get", - "uri" : "/api/catalog/v1/nspackages/a3394090-c5b4-49b4-974c-00a6eac755ab", + "uri" : "/api/catalog/v1/nspackages", "headers" : { "Accept" : "application/json", "Content-Type" : "application/json" @@ -10,18 +10,114 @@ }, "response" : { "status" : 200, - "json" : { - "csarId" : "a3394090-c5b4-49b4-974c-00a6eac755ab", + "json" : [ { + "csarId" : "0480ba69-7904-4099-b2c3-b8167b4889b1", + "packageInfo" : { + "nsdInvariantId" : null, + "csarName" : null, + "nsdProvider" : null, + "nsdId" : null, + "nsPackageId" : "0480ba69-7904-4099-b2c3-b8167b4889b1", + "downloadUrl" : "http://10.42.3.30:8806/static/catalog/0480ba69-7904-4099-b2c3-b8167b4889b1/None", + "nsdModel" : null, + "nsdVersion" : null + } + }, { + "csarId" : "3d9874ac-8a52-48ef-bdf2-bd463a5b394a", "packageInfo" : { "nsdInvariantId" : "c3887fb3-d1b2-477f-86c4-fd641ee9a7cf", - "csarName" : "/service/vfc/nfvo/catalog/static/catalog/a3394090-c5b4-49b4-974c-00a6eac755ab/Artifacts/Deployment/OTHER/ns.csar", + "csarName" : "/service/vfc/nfvo/catalog/static/catalog/3d9874ac-8a52-48ef-bdf2-bd463a5b394a/ns_vgw.csar", "nsdProvider" : "ONAP", "nsdId" : "ffdddc5d-a44b-45ae-8fc3-e6551cce350f", - "nsPackageId" : "a3394090-c5b4-49b4-974c-00a6eac755ab", - "downloadUrl" : "http://10.42.43.172:8806/static/catalog/a3394090-c5b4-49b4-974c-00a6eac755ab//service/vfc/nfvo/catalog/static/catalog/a3394090-c5b4-49b4-974c-00a6eac755ab/Artifacts/Deployment/OTHER/ns.csar", - "nsdModel" : "{\"vnffgs\": [], \"inputs\": {}, \"pnfs\": [], \"description\": \"VCPE Network Service\", \"graph\": {\"vgw\": [], \"vcpe_public_net\": [\"vgw\"]}, \"basepath\": \"/tmp/tmpaDLGbM\", \"vnfs\": [{\"networks\": [{\"key_name\": \"virtual_link\", \"vl_id\": \"vcpe_public_net\"}], \"dependencies\": [{\"key_name\": \"virtual_link\", \"vl_id\": \"vcpe_public_net\"}], \"vnf_id\": \"vgw\", \"description\": \"\", \"properties\": {\"descriptor_id\": \"3fca3543-07f5-492f-812c-ed462e4f94f4\", \"vnfm_info\": [\"gvnfmdriver\"], \"software_version\": \"1.0.0\", \"flavour_description\": \"simple\", \"descriptor_version\": \"1.0.0\", \"provider\": \"onap\", \"id\": \"3fca3543-07f5-492f-812c-ed462e4f94f4\", \"flavour_id\": \"simple\", \"product_name\": \"vcpe_vgw\"}}], \"ns_exposed\": {\"external_cps\": [], \"forward_cps\": []}, \"fps\": [], \"vls\": [{\"vl_id\": \"vcpe_public_net\", \"description\": \"\", \"properties\": {\"connectivity_type\": {\"layer_protocol\": \"ipv4\"}, \"vl_profile\": {\"cidr\": \"172.30.23.0/24\", \"max_bit_rate_requirements\": {\"root\": 10000000, \"leaf\": 10000000}, \"networkName\": \"oam-zte\", \"min_bit_rate_requirements\": {\"root\": 10000000, \"leaf\": 10000000}, \"dhcpEnabled\": false}, \"version\": \"1.0.0\"}}], \"ns\": {\"type\": \"tosca.nodes.nfv.NS\", \"requirements\": {}, \"properties\": {\"descriptor_id\": \"ffdddc5d-a44b-45ae-8fc3-e6551cce350f\", \"designer\": \"ONAP\", \"invariant_id\": \"c3887fb3-d1b2-477f-86c4-fd641ee9a7cf\", \"name\": \"vcpe\", \"verison\": \"1.0.0\", \"version\": \"1.0.0\"}, \"capabilities\": {}, \"metadata\": {\"nsd_designer\": \"ONAP\", \"nsd_name\": \"vcpe\", \"nsd_release_date_time\": \"2018-11-05 12:00:00\", \"nsd_invariant_id\": \"c3887fb3-d1b2-477f-86c4-fd641ee9a7cf\", \"nsd_file_structure_version\": \"1.0.0\"}}, \"nested_ns\": [], \"metadata\": {\"nsd_designer\": \"ONAP\", \"nsd_name\": \"vcpe\", \"nsd_release_date_time\": \"2018-11-05 12:00:00\", \"nsd_invariant_id\": \"c3887fb3-d1b2-477f-86c4-fd641ee9a7cf\", \"nsd_file_structure_version\": \"1.0.0\"}}", + "nsPackageId" : "3d9874ac-8a52-48ef-bdf2-bd463a5b394a", + "downloadUrl" : "http://10.42.3.30:8806/static/catalog/3d9874ac-8a52-48ef-bdf2-bd463a5b394a//service/vfc/nfvo/catalog/static/catalog/3d9874ac-8a52-48ef-bdf2-bd463a5b394a/ns_vgw.csar", + "nsdModel" : "{\"vnffgs\": [], \"inputs\": {}, \"pnfs\": [], \"description\": \"VCPE Network Service\", \"graph\": {\"vgw\": [], \"vcpe_public_net\": [\"vgw\"]}, \"basepath\": \"/tmp/tmpy7hg0X\", \"vnfs\": [{\"networks\": [{\"key_name\": \"virtual_link\", \"vl_id\": \"vcpe_public_net\"}], \"dependencies\": [{\"key_name\": \"virtual_link\", \"vl_id\": \"vcpe_public_net\"}], \"vnf_id\": \"vgw\", \"description\": \"\", \"properties\": {\"descriptor_id\": \"b1bb0ce7-2222-4fa7-95ed-4840d70a1177\", \"vnfm_info\": [\"gvnfmdriver\"], \"software_version\": \"1.0.0\", \"flavour_description\": \"simple\", \"descriptor_version\": \"1.0.0\", \"provider\": \"onap\", \"id\": \"b1bb0ce7-2222-4fa7-95ed-4840d70a1177\", \"flavour_id\": \"simple\", \"product_name\": \"vcpe_vgw\"}}], \"ns_exposed\": {\"external_cps\": [], \"forward_cps\": []}, \"fps\": [], \"vls\": [{\"vl_id\": \"vcpe_public_net\", \"description\": \"\", \"properties\": {\"connectivity_type\": {\"layer_protocol\": \"ipv4\"}, \"vl_profile\": {\"cidr\": \"172.30.23.0/24\", \"max_bit_rate_requirements\": {\"root\": 10000000, \"leaf\": 10000000}, \"networkName\": \"oam-zte\", \"min_bit_rate_requirements\": {\"root\": 10000000, \"leaf\": 10000000}, \"dhcpEnabled\": false}, \"version\": \"1.0.0\"}}], \"ns\": {\"type\": \"tosca.nodes.nfv.NS\", \"requirements\": {}, \"properties\": {\"descriptor_id\": \"ffdddc5d-a44b-45ae-8fc3-e6551cce350f\", \"designer\": \"ONAP\", \"invariant_id\": \"c3887fb3-d1b2-477f-86c4-fd641ee9a7cf\", \"name\": \"vcpe\", \"verison\": \"1.0.0\", \"version\": \"1.0.0\"}, \"capabilities\": {}, \"metadata\": {\"nsd_designer\": \"ONAP\", \"nsd_name\": \"vcpe\", \"nsd_release_date_time\": \"2018-11-05 12:00:00\", \"nsd_invariant_id\": \"c3887fb3-d1b2-477f-86c4-fd641ee9a7cf\", \"nsd_file_structure_version\": \"1.0.0\"}}, \"nested_ns\": [], \"metadata\": {\"nsd_designer\": \"ONAP\", \"nsd_name\": \"vcpe\", \"nsd_release_date_time\": \"2018-11-05 12:00:00\", \"nsd_invariant_id\": \"c3887fb3-d1b2-477f-86c4-fd641ee9a7cf\", \"nsd_file_structure_version\": \"1.0.0\"}}", "nsdVersion" : "1.0.0" } - } + }, { + "csarId" : "46cc23a4-4f6f-4ac1-9e05-d072cda548de", + "packageInfo" : { + "nsdInvariantId" : null, + "csarName" : null, + "nsdProvider" : null, + "nsdId" : null, + "nsPackageId" : "46cc23a4-4f6f-4ac1-9e05-d072cda548de", + "downloadUrl" : "http://10.42.3.30:8806/static/catalog/46cc23a4-4f6f-4ac1-9e05-d072cda548de/None", + "nsdModel" : null, + "nsdVersion" : null + } + }, { + "csarId" : "48a85bff-f520-45f2-9ac6-dc5c7ac47bb9", + "packageInfo" : { + "nsdInvariantId" : null, + "csarName" : null, + "nsdProvider" : null, + "nsdId" : null, + "nsPackageId" : "48a85bff-f520-45f2-9ac6-dc5c7ac47bb9", + "downloadUrl" : "http://10.42.3.30:8806/static/catalog/48a85bff-f520-45f2-9ac6-dc5c7ac47bb9/None", + "nsdModel" : null, + "nsdVersion" : null + } + }, { + "csarId" : "5f0baa1b-963b-4e47-83ec-7c49153cd6d8", + "packageInfo" : { + "nsdInvariantId" : null, + "csarName" : null, + "nsdProvider" : null, + "nsdId" : null, + "nsPackageId" : "5f0baa1b-963b-4e47-83ec-7c49153cd6d8", + "downloadUrl" : "http://10.42.3.30:8806/static/catalog/5f0baa1b-963b-4e47-83ec-7c49153cd6d8/None", + "nsdModel" : null, + "nsdVersion" : null + } + }, { + "csarId" : "93499e0a-2542-4446-a1f2-67724fc31e77", + "packageInfo" : { + "nsdInvariantId" : null, + "csarName" : null, + "nsdProvider" : null, + "nsdId" : null, + "nsPackageId" : "93499e0a-2542-4446-a1f2-67724fc31e77", + "downloadUrl" : "http://10.42.3.30:8806/static/catalog/93499e0a-2542-4446-a1f2-67724fc31e77/None", + "nsdModel" : null, + "nsdVersion" : null + } + }, { + "csarId" : "a87c1f13-d76e-46eb-a17a-70a54a0fd6d8", + "packageInfo" : { + "nsdInvariantId" : null, + "csarName" : null, + "nsdProvider" : null, + "nsdId" : null, + "nsPackageId" : "a87c1f13-d76e-46eb-a17a-70a54a0fd6d8", + "downloadUrl" : "http://10.42.3.30:8806/static/catalog/a87c1f13-d76e-46eb-a17a-70a54a0fd6d8/None", + "nsdModel" : null, + "nsdVersion" : null + } + }, { + "csarId" : "f648ff9c-7074-40ca-bf4c-cc8ff732ef52", + "packageInfo" : { + "nsdInvariantId" : null, + "csarName" : null, + "nsdProvider" : null, + "nsdId" : null, + "nsPackageId" : "f648ff9c-7074-40ca-bf4c-cc8ff732ef52", + "downloadUrl" : "http://10.42.3.30:8806/static/catalog/f648ff9c-7074-40ca-bf4c-cc8ff732ef52/None", + "nsdModel" : null, + "nsdVersion" : null + } + }, { + "csarId" : "f767178c-ea77-4488-b9ea-c2b03aa108d5", + "packageInfo" : { + "nsdInvariantId" : null, + "csarName" : null, + "nsdProvider" : null, + "nsdId" : null, + "nsPackageId" : "f767178c-ea77-4488-b9ea-c2b03aa108d5", + "downloadUrl" : "http://10.42.3.30:8806/static/catalog/f767178c-ea77-4488-b9ea-c2b03aa108d5/None", + "nsdModel" : null, + "nsdVersion" : null + } + } ] } } ]
\ No newline at end of file diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-ns-schema-sample.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-ns-schema-sample.yaml index afc4f3fd..539c8d1e 100644 --- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-ns-schema-sample.yaml +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-ns-schema-sample.yaml @@ -1,16 +1,126 @@ open_cli_sample_version: 1.0 -name: vfc-catalog-get-ns +name: -m version: onap-dublin samples: sample1: - name: vfc-catalog-get-ns - input: -m http://10.12.5.155:30280 -c a3394090-c5b4-49b4-974c-00a6eac755ab + name: -m + input: http://10.12.5.155:30280 moco: vfc-catalog-get-ns-schema-moco.json output: | - +--------------------------------------+--------------------------------------+--------------+--------------------------------------+----------------------------------------------------+ - |nsd-invariant-id |ns-package-id |nsd-provider |nsd-id |csar-name | - +--------------------------------------+--------------------------------------+--------------+--------------------------------------+----------------------------------------------------+ - |c3887fb3-d1b2-477f-86c4-fd641ee9a7cf |a3394090-c5b4-49b4-974c-00a6eac755ab |ONAP |ffdddc5d-a44b-45ae-8fc3-e6551cce350f |/service/vfc/nfvo/catalog/static/catalog/a3394090- | - | | | | |c5b4-49b4-974c-00a6eac755ab/Artifacts/Deployment/O | - | | | | |THER/ns.csar | - +--------------------------------------+--------------------------------------+--------------+--------------------------------------+----------------------------------------------------+ + +--------------------------------------+----------------------------------------------------+ + |csar-id |package-info | + +--------------------------------------+----------------------------------------------------+ + |0480ba69-7904-4099-b2c3-b8167b4889b1 |{nsdInvariantId=null, csarName=null, | + | |nsdProvider=null, nsdId=null, | + | |nsPackageId=0480ba69-7904-4099-b2c3-b8167b4889b1, | + | |downloadUrl=http://10.42.3.30:8806/static/catalog/ | + | |0480ba69-7904-4099-b2c3-b8167b4889b1/None, | + | |nsdModel=null, nsdVersion=null} | + +--------------------------------------+----------------------------------------------------+ + |3d9874ac-8a52-48ef-bdf2-bd463a5b394a |{nsdInvariantId=c3887fb3-d1b2-477f-86c4-fd641ee9a7 | + | |cf, csarName=/service/vfc/nfvo/catalog/static/cata | + | |log/3d9874ac-8a52-48ef-bdf2-bd463a5b394a/ns_vgw.cs | + | |ar, nsdProvider=ONAP, | + | |nsdId=ffdddc5d-a44b-45ae-8fc3-e6551cce350f, | + | |nsPackageId=3d9874ac-8a52-48ef-bdf2-bd463a5b394a, | + | |downloadUrl=http://10.42.3.30:8806/static/catalog/ | + | |3d9874ac-8a52-48ef-bdf2-bd463a5b394a//service/vfc/ | + | |nfvo/catalog/static/catalog/3d9874ac-8a52-48ef-bdf | + | |2-bd463a5b394a/ns_vgw.csar, nsdModel={"vnffgs": | + | |[], "inputs": {}, "pnfs": [], "description": | + | |"VCPE Network Service", "graph": {"vgw": [], | + | |"vcpe_public_net": ["vgw"]}, "basepath": | + | |"/tmp/tmpy7hg0X", "vnfs": [{"networks": | + | |[{"key_name": "virtual_link", "vl_id": | + | |"vcpe_public_net"}], "dependencies": | + | |[{"key_name": "virtual_link", "vl_id": | + | |"vcpe_public_net"}], "vnf_id": "vgw", | + | |"description": "", "properties": | + | |{"descriptor_id": | + | |"b1bb0ce7-2222-4fa7-95ed-4840d70a1177", | + | |"vnfm_info": ["gvnfmdriver"], "software_version": | + | |"1.0.0", "flavour_description": "simple", | + | |"descriptor_version": "1.0.0", "provider": | + | |"onap", "id": | + | |"b1bb0ce7-2222-4fa7-95ed-4840d70a1177", | + | |"flavour_id": "simple", "product_name": | + | |"vcpe_vgw"}}], "ns_exposed": {"external_cps": [], | + | |"forward_cps": []}, "fps": [], "vls": [{"vl_id": | + | |"vcpe_public_net", "description": "", | + | |"properties": {"connectivity_type": | + | |{"layer_protocol": "ipv4"}, "vl_profile": | + | |{"cidr": "172.30.23.0/24", | + | |"max_bit_rate_requirements": {"root": 10000000, | + | |"leaf": 10000000}, "networkName": "oam-zte", | + | |"min_bit_rate_requirements": {"root": 10000000, | + | |"leaf": 10000000}, "dhcpEnabled": false}, | + | |"version": "1.0.0"}}], "ns": {"type": | + | |"tosca.nodes.nfv.NS", "requirements": {}, | + | |"properties": {"descriptor_id": | + | |"ffdddc5d-a44b-45ae-8fc3-e6551cce350f", | + | |"designer": "ONAP", "invariant_id": | + | |"c3887fb3-d1b2-477f-86c4-fd641ee9a7cf", "name": | + | |"vcpe", "verison": "1.0.0", "version": "1.0.0"}, | + | |"capabilities": {}, "metadata": {"nsd_designer": | + | |"ONAP", "nsd_name": "vcpe", | + | |"nsd_release_date_time": "2018-11-05 12:00:00", | + | |"nsd_invariant_id": | + | |"c3887fb3-d1b2-477f-86c4-fd641ee9a7cf", | + | |"nsd_file_structure_version": "1.0.0"}}, | + | |"nested_ns": [], "metadata": {"nsd_designer": | + | |"ONAP", "nsd_name": "vcpe", | + | |"nsd_release_date_time": "2018-11-05 12:00:00", | + | |"nsd_invariant_id": | + | |"c3887fb3-d1b2-477f-86c4-fd641ee9a7cf", | + | |"nsd_file_structure_version": "1.0.0"}}, | + | |nsdVersion=1.0.0} | + +--------------------------------------+----------------------------------------------------+ + |46cc23a4-4f6f-4ac1-9e05-d072cda548de |{nsdInvariantId=null, csarName=null, | + | |nsdProvider=null, nsdId=null, | + | |nsPackageId=46cc23a4-4f6f-4ac1-9e05-d072cda548de, | + | |downloadUrl=http://10.42.3.30:8806/static/catalog/ | + | |46cc23a4-4f6f-4ac1-9e05-d072cda548de/None, | + | |nsdModel=null, nsdVersion=null} | + +--------------------------------------+----------------------------------------------------+ + |48a85bff-f520-45f2-9ac6-dc5c7ac47bb9 |{nsdInvariantId=null, csarName=null, | + | |nsdProvider=null, nsdId=null, | + | |nsPackageId=48a85bff-f520-45f2-9ac6-dc5c7ac47bb9, | + | |downloadUrl=http://10.42.3.30:8806/static/catalog/ | + | |48a85bff-f520-45f2-9ac6-dc5c7ac47bb9/None, | + | |nsdModel=null, nsdVersion=null} | + +--------------------------------------+----------------------------------------------------+ + |5f0baa1b-963b-4e47-83ec-7c49153cd6d8 |{nsdInvariantId=null, csarName=null, | + | |nsdProvider=null, nsdId=null, | + | |nsPackageId=5f0baa1b-963b-4e47-83ec-7c49153cd6d8, | + | |downloadUrl=http://10.42.3.30:8806/static/catalog/ | + | |5f0baa1b-963b-4e47-83ec-7c49153cd6d8/None, | + | |nsdModel=null, nsdVersion=null} | + +--------------------------------------+----------------------------------------------------+ + |93499e0a-2542-4446-a1f2-67724fc31e77 |{nsdInvariantId=null, csarName=null, | + | |nsdProvider=null, nsdId=null, | + | |nsPackageId=93499e0a-2542-4446-a1f2-67724fc31e77, | + | |downloadUrl=http://10.42.3.30:8806/static/catalog/ | + | |93499e0a-2542-4446-a1f2-67724fc31e77/None, | + | |nsdModel=null, nsdVersion=null} | + +--------------------------------------+----------------------------------------------------+ + |a87c1f13-d76e-46eb-a17a-70a54a0fd6d8 |{nsdInvariantId=null, csarName=null, | + | |nsdProvider=null, nsdId=null, | + | |nsPackageId=a87c1f13-d76e-46eb-a17a-70a54a0fd6d8, | + | |downloadUrl=http://10.42.3.30:8806/static/catalog/ | + | |a87c1f13-d76e-46eb-a17a-70a54a0fd6d8/None, | + | |nsdModel=null, nsdVersion=null} | + +--------------------------------------+----------------------------------------------------+ + |f648ff9c-7074-40ca-bf4c-cc8ff732ef52 |{nsdInvariantId=null, csarName=null, | + | |nsdProvider=null, nsdId=null, | + | |nsPackageId=f648ff9c-7074-40ca-bf4c-cc8ff732ef52, | + | |downloadUrl=http://10.42.3.30:8806/static/catalog/ | + | |f648ff9c-7074-40ca-bf4c-cc8ff732ef52/None, | + | |nsdModel=null, nsdVersion=null} | + +--------------------------------------+----------------------------------------------------+ + |f767178c-ea77-4488-b9ea-c2b03aa108d5 |{nsdInvariantId=null, csarName=null, | + | |nsdProvider=null, nsdId=null, | + | |nsPackageId=f767178c-ea77-4488-b9ea-c2b03aa108d5, | + | |downloadUrl=http://10.42.3.30:8806/static/catalog/ | + | |f767178c-ea77-4488-b9ea-c2b03aa108d5/None, | + | |nsdModel=null, nsdVersion=null} | + +--------------------------------------+----------------------------------------------------+ diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-vnf-schema-moco.json b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-vnf-schema-moco.json index fa1cc5dd..43e2fb7e 100644 --- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-vnf-schema-moco.json +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-vnf-schema-moco.json @@ -1,7 +1,7 @@ [ { "request" : { "method" : "get", - "uri" : "/api/catalog/v1/vnfpackages/af59a474-6391-4500-989c-f78df18d77f0", + "uri" : "/api/catalog/v1/vnfpackages", "headers" : { "Accept" : "application/json", "Content-Type" : "application/json" @@ -10,19 +10,123 @@ }, "response" : { "status" : 200, - "json" : { - "csarId" : "af59a474-6391-4500-989c-f78df18d77f0", + "json" : [ { + "csarId" : "09d355fb-83d6-4f91-ba8a-199ef7d24dc7", "packageInfo" : { - "vnfdId" : "0408f076-e6c0-4c82-9940-272fddbb82de", - "vnfPackageId" : "af59a474-6391-4500-989c-f78df18d77f0", + "vnfdId" : null, + "vnfPackageId" : "09d355fb-83d6-4f91-ba8a-199ef7d24dc7", + "vnfdProvider" : null, + "vnfdVersion" : null, + "vnfVersion" : null, + "csarName" : null, + "vnfdModel" : null, + "downloadUrl" : "http://10.42.3.30:8806/static/catalog/09d355fb-83d6-4f91-ba8a-199ef7d24dc7/None" + }, + "imageInfo" : [ ] + }, { + "csarId" : "24d97292-0845-49ed-9d9d-2ffa927c783f", + "packageInfo" : { + "vnfdId" : null, + "vnfPackageId" : "24d97292-0845-49ed-9d9d-2ffa927c783f", + "vnfdProvider" : null, + "vnfdVersion" : null, + "vnfVersion" : null, + "csarName" : null, + "vnfdModel" : null, + "downloadUrl" : "http://10.42.3.30:8806/static/catalog/24d97292-0845-49ed-9d9d-2ffa927c783f/None" + }, + "imageInfo" : [ ] + }, { + "csarId" : "6eb437ba-e295-4139-bac9-6bf857fd5629", + "packageInfo" : { + "vnfdId" : null, + "vnfPackageId" : "6eb437ba-e295-4139-bac9-6bf857fd5629", + "vnfdProvider" : null, + "vnfdVersion" : null, + "vnfVersion" : null, + "csarName" : null, + "vnfdModel" : null, + "downloadUrl" : "http://10.42.3.30:8806/static/catalog/6eb437ba-e295-4139-bac9-6bf857fd5629/None" + }, + "imageInfo" : [ ] + }, { + "csarId" : "7e9385be-497a-4707-a530-1274df12eb9b", + "packageInfo" : { + "vnfdId" : null, + "vnfPackageId" : "7e9385be-497a-4707-a530-1274df12eb9b", + "vnfdProvider" : null, + "vnfdVersion" : null, + "vnfVersion" : null, + "csarName" : null, + "vnfdModel" : null, + "downloadUrl" : "http://10.42.3.30:8806/static/catalog/7e9385be-497a-4707-a530-1274df12eb9b/None" + }, + "imageInfo" : [ ] + }, { + "csarId" : "905e4a2f-5f24-4253-aa76-b293a7c2e52f", + "packageInfo" : { + "vnfdId" : null, + "vnfPackageId" : "905e4a2f-5f24-4253-aa76-b293a7c2e52f", + "vnfdProvider" : null, + "vnfdVersion" : null, + "vnfVersion" : null, + "csarName" : null, + "vnfdModel" : null, + "downloadUrl" : "http://10.42.3.30:8806/static/catalog/905e4a2f-5f24-4253-aa76-b293a7c2e52f/None" + }, + "imageInfo" : [ ] + }, { + "csarId" : "965cb252-788f-4e24-ba92-089866d47d37", + "packageInfo" : { + "vnfdId" : null, + "vnfPackageId" : "965cb252-788f-4e24-ba92-089866d47d37", + "vnfdProvider" : null, + "vnfdVersion" : null, + "vnfVersion" : null, + "csarName" : null, + "vnfdModel" : null, + "downloadUrl" : "http://10.42.3.30:8806/static/catalog/965cb252-788f-4e24-ba92-089866d47d37/None" + }, + "imageInfo" : [ ] + }, { + "csarId" : "a8571488-d72d-4d9f-b534-4e7380390175", + "packageInfo" : { + "vnfdId" : "b1bb0ce7-2222-4fa7-95ed-4840d70a1177", + "vnfPackageId" : "a8571488-d72d-4d9f-b534-4e7380390175", "vnfdProvider" : "onap", "vnfdVersion" : "1.0", - "vnfVersion" : "1.0.0", - "csarName" : "tst_vgmux.csar", - "vnfdModel" : "{\"volume_storages\": [{\"properties\": {\"size_of_storage\": \"\\\"40 GB\\\"\", \"type_of_storage\": \"root\"}, \"volume_storage_id\": \"VirtualStorage_root_all\", \"description\": \"\"}], \"vnf\": {\"type\": \"tosca.nodes.nfv.VNF\", \"requirements\": {\"virtual_link\": [\"Cp_vgmux_public\", \"virtual_link\"]}, \"properties\": {\"descriptor_id\": \"0408f076-e6c0-4c82-9940-272fddbb82de\", \"flavour_description\": \"simple\", \"descriptor_verison\": \"1.0\", \"software_version\": \"1.0.0\", \"template_name\": \"vCPE_vgmux\", \"vnfm_info\": [\"gvnfmdriver\"], \"descriptor_version\": \"1.0.0\", \"provider\": \"onap\", \"flavour_id\": \"simple\", \"product_name\": \"vcpe_vgmux\"}, \"capabilities\": {}, \"metadata\": {\"template_name\": \"vCPE_vgmux\", \"template_version\": \"1.0\", \"template_author\": \"onap\"}}, \"vdus\": [{\"description\": \"\", \"virtual_storages\": [{\"virtual_storage_id\": \"VirtualStorage_root_all\"}], \"vdu_id\": \"VDU_vgmux_0\", \"artifacts\": [{\"artifact_name\": \"sw_image\", \"type\": \"tosca.artifacts.nfv.SwImage\", \"file\": \"../Artifacts/Deployment/OTHER/ubuntu_16.04\"}], \"dependencies\": [], \"virtual_compute\": {\"virtual_cpu\": {\"num_virtual_cpu\": 2, \"cpu_architecture\": \"generic\"}, \"virtual_memory\": {\"vdu_memory_requirements\": {\"numberOfPages\": \"{\\\"schemaVersion\\\": \\\"0\\\", \\\"schemaSelector\\\": \\\"\\\", \\\"hardwarePlatform\\\": \\\"generic\\\", \\\"mandatory\\\": \\\"true\\\", \\\"configurationValue\\\": \\\"1024\\\"}\", \"memoryPageSize\": \"{\\\"schemaVersion\\\": \\\"0\\\", \\\"schemaSelector\\\": \\\"\\\", \\\"hardwarePlatform\\\": \\\"generic\\\", \\\"mandatory\\\": \\\"true\\\", \\\"configurationValue\\\": \\\"2 MB\\\"}\"}, \"virtual_mem_size\": \"4096 MB\"}}, \"vls\": [\"VL_bng_gmux_private_net\", \"VL_mux_gw_private_net\"], \"cps\": [\"Cp_vgmux_bng_gmux_private_net\", \"Cp_vgmux_mux_gw_private_net\", \"Cp_vgmux_public\"], \"type\": \"tosca.nodes.nfv.Vdu.Compute\", \"properties\": {\"name\": \"zdcpe1cpe01mux01\", \"inject_files\": {\"source_path\": \"../Artifacts/Deployment/OTHER/authorized_keys\", \"source_data_base64\": \"c3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCQVFER3g2U0tyQXVDejFWOEtHZXZa\\ndWVrc0xkV29QV0pQNnozcjI5WjdUbVBWRU9qTSs3UElQZVNzMkJWUngzcm5IWkJBbGFzTXJaK2ZK\\nQlMyNXRzOXZmQytJdGV6UWFoL2hyOXZya213eENSNTRMYjg0cG9XK3NUb1BlRjZpNWVaWTdXK2pX\\nSmZMYUZTRng5ZDJ2cDR6ZXMvZk9sVDNOdllDWGJuLzNRZHJ5UW9HbDdWRkk4b2VtWnlwVmNpa1pY\\nRWxKZWVLZ0FWZFN3bnJ6dXF0Ty90bWJYY0FlU2JZdlZqa2k4eXdZY3NXTVZNWVdVV2hoKzFCQUI2\\na1huVHNJV3F6cnEwUGZ2eSs4MVdEd3RpcXNxbWQ5M0hZOGhFMHNjQnJYRkJaelFTL0FZZklGQmxF\\ndUZOZExjemNobnRqYlowbjdkbURYazh6SHRDWllOazdrd2I4ay8K\\n\", \"dest_path\": \"/home/ubuntu/.ssh/authorized_keys\"}, \"user_data\": \"#!/bin/bash\\nMETADATA=`curl -s http://169.254.169.254/openstack/2012-08-10/meta_data.json`\\napt-get -y install jq\\n\\nget_metadata () {\\n echo $METADATA | jq -r \\\".meta.$1\\\"\\n}\\n\\n# Create configuration files\\nmkdir /opt/config\\necho \\\"$(get_metadata mux_to_bng_net_ipaddr)\\\" > /opt/config/mux_to_bng_net_ipaddr.txt\\necho \\\"$(get_metadata oam_ipaddr)\\\" > /opt/config/oam_ipaddr.txt\\necho \\\"$(get_metadata mux_gw_net_ipaddr)\\\" > /opt/config/mux_gw_net_ipaddr.txt\\necho \\\"$(get_metadata bng_to_mux_net_ipaddr)\\\" > /opt/config/bng_to_mux_net_ipaddr.txt\\necho \\\"$(get_metadata bng_mux_net_cidr)\\\" > /opt/config/bng_mux_net_cidr.txt\\necho \\\"$(get_metadata oam_cidr)\\\" > /opt/config/oam_cidr.txt\\necho \\\"$(get_metadata mux_gw_net_cidr)\\\" > /opt/config/mux_gw_net_cidr.txt\\necho \\\"$(get_metadata brg_bng_net_cidr)\\\" > /opt/config/brg_bng_net_cidr.txt\\necho \\\"$(get_metadata install_script_version)\\\" > /opt/config/install_script_version.txt\\necho \\\"$(get_metadata cloud_env)\\\" > /opt/config/cloud_env.txt\\necho \\\"$(get_metadata nexus_artifact_repo)\\\" > /opt/config/nexus_artifact_repo.txt\\n\\n# Download and run install script\\napt-get -y install unzip\\nINSTALL_SCRIPT_VERSION=$(get_metadata install_script_version)\\nNEXUS_ARTIFACT_REPO=$(get_metadata nexus_artifact_repo)\\nif [[ \\\"${INSTALL_SCRIPT_VERSION}\\\" =~ \\\"SNAPSHOT\\\" ]]; then REPO=snapshots; else REPO=releases; fi\\ncurl -k -L \\\"${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vcpe&a=vcpe-scripts&e=zip&v=${INSTALL_SCRIPT_VERSION}\\\" -o /opt/vcpe-scripts-${INSTALL_SCRIPT_VERSION}.zip\\nunzip -j /opt/vcpe-scripts-${INSTALL_SCRIPT_VERSION}.zip -d /opt v_gmux_install.sh\\ncd /opt\\nchmod +x v_gmux_install.sh\\n./v_gmux_install.sh\\n\", \"configurable_properties\": {\"additional_vnfc_configurable_properties\": {}}, \"meta_data\": {\"vf_module_id\": \"vCPE_Intrastructure_Metro_vGMUX\", \"oam_cidr\": \"10.0.0.0/16\", \"oam_ipaddr\": \"10.0.101.20\", \"bng_to_mux_net_ipaddr\": \"10.1.0.10\", \"bng_mux_net_cidr\": \"10.1.0.0/24\", \"install_script_version\": \"1.2.0-SNAPSHOT\", \"mux_gw_net_cidr\": \"10.5.0.0/24\", \"mux_gw_net_ipaddr\": \"10.5.0.20\", \"cloud_env\": \"openstack\", \"vnf_id\": \"vCPE_Infrastructure_vGMUX_demo_app\", \"brg_bng_net_cidr\": \"10.3.0.0/24\", \"mux_to_bng_net_ipaddr\": \"10.1.0.20\", \"nexus_artifact_repo\": \"https://nexus.onap.org\"}, \"vdu_profile\": {\"max_number_of_instances\": 1, \"watchdog\": \"none\", \"min_number_of_instances\": 1}, \"description\": \"vgmux\"}}], \"description\": \"vCPE_vgmux\", \"inputs\": {\"vf_module_id\": {\"default\": \"vCPE_Intrastructure_Metro_vGMUX\", \"type\": \"string\", \"description\": \"The vCPE Module ID is provided by ONAP\"}, \"install_script_version\": {\"default\": \"1.2.0-SNAPSHOT\", \"type\": \"string\", \"description\": \"install script version number\"}, \"vnf_id\": {\"default\": \"vCPE_Infrastructure_vGMUX_demo_app\", \"type\": \"string\", \"description\": \"The VNF ID is provided by ONAP\"}, \"onap_private_net_id\": {\"type\": \"string\", \"description\": \"onap OAM network id\"}, \"mux_gw_private_net_id\": {\"default\": \"zdfw1muxgw01_private\", \"type\": \"string\", \"description\": \"Private network that connects vGMUX to vGWs\"}, \"vcpe_image_name\": {\"default\": \"ubuntu_16.04\", \"type\": \"string\", \"description\": \"image name for vcpe in openstack glance\"}, \"bng_gmux_private_net_id\": {\"default\": \"zdfw1bngmux01_private\", \"type\": \"string\", \"description\": \"Private network that connects vBNG to vGMUX\"}, \"onap_private_net_cidr\": {\"default\": \"10.0.0.0/16\", \"type\": \"string\", \"description\": \"oanp OAM network cidr\"}, \"vgmux_private_ip_0\": {\"default\": \"10.1.0.20\", \"type\": \"string\", \"description\": \"Private IP address that is assigned to the vGMUX to communicate with the vBNG\"}, \"vgmux_private_ip_1\": {\"default\": \"10.0.101.20\", \"type\": \"string\", \"description\": \"Private IP address that is assigned to the vGMUX to communicate with ONAP components\"}, \"vgmux_private_ip_2\": {\"default\": \"10.5.0.20\", \"type\": \"string\", \"description\": \"Private IP address that is assigned to the vGMUX to communicate with vGWs\"}, \"dcae_collector_port\": {\"default\": 8080, \"type\": \"integer\", \"description\": \"dcae collector port\"}, \"mux_gw_private_net_cidr\": {\"default\": \"10.5.0.0/24\", \"type\": \"string\", \"description\": \"The CIDR of the vGMUX private network\"}, \"vgmux_name_0\": {\"default\": \"zdcpe1cpe01mux01\", \"type\": \"string\", \"description\": \"Name of the vGMUX\"}, \"brgemu_bng_private_net_cidr\": {\"default\": \"10.3.0.0/24\", \"type\": \"string\", \"description\": \"The CIDR of the vBRG-vBNG private network\"}, \"public_net_id\": {\"type\": \"string\", \"description\": \"public network id used during onap installation\"}, \"dcae_collector_ip\": {\"default\": \"10.0.4.102\", \"type\": \"string\", \"description\": \"dcae collector ip\"}, \"cloud_env\": {\"default\": \"openstack\", \"type\": \"string\", \"description\": \"cloud environment(openstack or rackspace)\"}, \"pub_key\": {\"default\": \"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGx6SKrAuCz1V8KGevZueksLdWoPWJP6z3r29Z7TmPVEOjM+7PIPeSs2BVRx3rnHZBAlasMrZ+fJBS25ts9vfC+ItezQah/hr9vrkmwxCR54Lb84poW+sToPeF6i5eZY7W+jWJfLaFSFx9d2vp4zes/fOlT3NvYCXbn/3QdryQoGl7VFI8oemZypVcikZXElJeeKgAVdSwnrzuqtO/tmbXcAeSbYvVjki8ywYcsWMVMYWUWhh+1BAB6kXnTsIWqzrq0Pfvy+81WDwtiqsqmd93HY8hE0scBrXFBZzQS/AYfIFBlEuFNdLczchntjbZ0n7dmDXk8zHtCZYNk7kwb8k/\", \"type\": \"string\", \"description\": \"ssh public key\"}, \"bng_gmux_private_ip\": {\"default\": \"10.1.0.10\", \"type\": \"string\", \"description\": \"Private IP address that is assigned to the vBNG to communicate with the vGMUX\"}, \"nexus_artifact_repo\": {\"default\": \"https://nexus.onap.org\", \"type\": \"string\", \"description\": \"Root URL for the Nexus repository for Maven artifacts\"}, \"bng_gmux_private_net_cidr\": {\"default\": \"10.1.0.0/24\", \"type\": \"string\", \"description\": \"The CIDR of the vBNG-vGMUX private network\"}}, \"graph\": {\"VL_mux_gw_private_net\": [\"Cp_vgmux_mux_gw_private_net\"], \"Cp_vgmux_mux_gw_private_net\": [], \"Cp_vgmux_bng_gmux_private_net\": [], \"VDU_vgmux_0\": [\"Cp_vgmux_bng_gmux_private_net\", \"Cp_vgmux_mux_gw_private_net\", \"Cp_vgmux_public\"], \"VirtualStorage_root_all\": [\"VDU_vgmux_0\"], \"VL_bng_gmux_private_net\": [\"Cp_vgmux_bng_gmux_private_net\"], \"Cp_vgmux_public\": []}, \"basepath\": \"/tmp/tmp9s9juL/Definitions\", \"vnf_exposed\": {\"external_cps\": [{\"key_name\": \"virtual_link\", \"cpd_id\": \"Cp_vgmux_public\"}], \"forward_cps\": []}, \"vls\": [{\"vl_id\": \"VL_mux_gw_private_net\", \"description\": \"\", \"properties\": {\"connectivity_type\": {\"layer_protocol\": \"ipv4\"}, \"vl_profile\": {\"physicalNetwork\": \"lsw-05-sriov-1\", \"max_bit_rate_requirements\": {\"root\": 10000000, \"leaf\": 10000000}, \"min_bit_rate_requirements\": {\"root\": 10000000, \"leaf\": 10000000}, \"networkType\": \"vlan\", \"cidr\": \"10.5.0.0/24\", \"networkName\": \"zdfw1muxgw01_private\", \"dhcpEnabled\": false}}}, {\"vl_id\": \"VL_bng_gmux_private_net\", \"description\": \"\", \"properties\": {\"connectivity_type\": {\"layer_protocol\": \"ipv4\"}, \"vl_profile\": {\"physicalNetwork\": \"lsw-05-sriov-1\", \"max_bit_rate_requirements\": {\"root\": 10000000, \"leaf\": 10000000}, \"min_bit_rate_requirements\": {\"root\": 10000000, \"leaf\": 10000000}, \"networkType\": \"vlan\", \"cidr\": \"10.1.0.0/24\", \"networkName\": \"zdfw1bngmux01_private\", \"dhcpEnabled\": false}}}], \"cps\": [{\"vl_id\": \"VL_bng_gmux_private_net\", \"description\": \"\", \"vdu_id\": \"VDU_vgmux_0\", \"properties\": {\"vnic_type\": \"direct\", \"virtual_network_interface_requirements\": [{\"network_interface_requirements\": {\"interfaceType\": \"{\\\"schemaVersion\\\": \\\"0\\\", \\\"schemaSelector\\\": \\\"\\\", \\\"hardwarePlatform\\\": \\\"generic\\\", \\\"mandatory\\\": \\\"true\\\", \\\"configurationValue\\\": \\\"SR-IOV\\\"}\"}, \"support_mandatory\": true, \"name\": \"sriov-support\", \"nic_io_requirements\": {\"logical_node_requirements\": {\"pciVendorId\": \"{\\\"schemaVersion\\\": \\\"0\\\", \\\"schemaSelector\\\": \\\"\\\", \\\"hardwarePlatform\\\": \\\"generic\\\", \\\"mandatory\\\": \\\"true\\\", \\\"configurationValue\\\": \\\"1234\\\"}\", \"pciNumDevices\": \"{\\\"schemaVersion\\\": \\\"0\\\", \\\"schemaSelector\\\": \\\"\\\", \\\"hardwarePlatform\\\": \\\"generic\\\", \\\"mandatory\\\": \\\"true\\\", \\\"configurationValue\\\": \\\"1\\\"}\", \"pciDeviceId\": \"{\\\"schemaVersion\\\": \\\"0\\\", \\\"schemaSelector\\\": \\\"\\\", \\\"hardwarePlatform\\\": \\\"generic\\\", \\\"mandatory\\\": \\\"true\\\", \\\"configurationValue\\\": \\\"5678\\\"}\"}}}], \"layer_protocol\": [\"ipv4\"], \"trunk_mode\": \"false\", \"protocol_data\": [{\"asscociated_layer_protocol\": \"ipv4\", \"address_data\": {\"address_type\": \"ip_address\", \"l3_address_data\": {\"floating_ip_activated\": false, \"fixed_ip_address\": [\"10.1.0.20\"], \"ip_address_assignment\": false}}}]}, \"cp_id\": \"Cp_vgmux_bng_gmux_private_net\", \"cpd_id\": \"Cp_vgmux_bng_gmux_private_net\"}, {\"vl_id\": \"VL_mux_gw_private_net\", \"description\": \"\", \"vdu_id\": \"VDU_vgmux_0\", \"properties\": {\"vnic_type\": \"direct\", \"virtual_network_interface_requirements\": [{\"network_interface_requirements\": {\"interfaceType\": \"{\\\"schemaVersion\\\": \\\"0\\\", \\\"schemaSelector\\\": \\\"\\\", \\\"hardwarePlatform\\\": \\\"generic\\\", \\\"mandatory\\\": \\\"true\\\", \\\"configurationValue\\\": \\\"SR-IOV\\\"}\"}, \"support_mandatory\": true, \"name\": \"sriov-support\", \"nic_io_requirements\": {\"logical_node_requirements\": {\"pciVendorId\": \"{\\\"schemaVersion\\\": \\\"0\\\", \\\"schemaSelector\\\": \\\"\\\", \\\"hardwarePlatform\\\": \\\"generic\\\", \\\"mandatory\\\": \\\"true\\\", \\\"configurationValue\\\": \\\"1234\\\"}\", \"pciNumDevices\": \"{\\\"schemaVersion\\\": \\\"0\\\", \\\"schemaSelector\\\": \\\"\\\", \\\"hardwarePlatform\\\": \\\"generic\\\", \\\"mandatory\\\": \\\"true\\\", \\\"configurationValue\\\": \\\"1\\\"}\", \"pciDeviceId\": \"{\\\"schemaVersion\\\": \\\"0\\\", \\\"schemaSelector\\\": \\\"\\\", \\\"hardwarePlatform\\\": \\\"generic\\\", \\\"mandatory\\\": \\\"true\\\", \\\"configurationValue\\\": \\\"5678\\\"}\"}}}], \"layer_protocol\": [\"ipv4\"], \"trunk_mode\": \"false\", \"protocol_data\": [{\"asscociated_layer_protocol\": \"ipv4\", \"address_data\": {\"address_type\": \"ip_address\", \"l3_address_data\": {\"floating_ip_activated\": false, \"fixed_ip_address\": [\"10.5.0.20\"], \"ip_address_assignment\": false}}}]}, \"cp_id\": \"Cp_vgmux_mux_gw_private_net\", \"cpd_id\": \"Cp_vgmux_mux_gw_private_net\"}, {\"vl_id\": \"\", \"description\": \"\", \"vdu_id\": \"VDU_vgmux_0\", \"properties\": {\"layer_protocol\": [\"ipv4\"], \"trunk_mode\": \"false\", \"protocol_data\": [{\"asscociated_layer_protocol\": \"ipv4\", \"address_data\": {\"address_type\": \"ip_address\", \"l3_address_data\": {\"floating_ip_activated\": false, \"ip_address_assignment\": false}}}]}, \"cp_id\": \"Cp_vgmux_public\", \"cpd_id\": \"Cp_vgmux_public\"}], \"metadata\": {\"template_name\": \"vCPE_vgmux\", \"template_version\": \"1.0\", \"template_author\": \"onap\"}}", - "downloadUrl" : "http://10.42.43.172:8806/static/catalog/af59a474-6391-4500-989c-f78df18d77f0/tst_vgmux.csar" + "vnfVersion" : "1.0", + "csarName" : "vgw.csar", + "vnfdModel" : "{\"volume_storages\": [], \"vnf\": {\"type\": \"tosca.nodes.nfv.VNF\", \"requirements\": [{\"virtual_link_public\": {\"capability\": \"tosca.capabilities.nfv.VirtualLinkable\", \"occurrences\": [0, 1], \"relationship\": \"tosca.relationships.nfv.VirtualLinksTo\"}}, {\"virtual_link_private\": {\"capability\": \"tosca.capabilities.nfv.VirtualLinkable\", \"occurrences\": [0, 1], \"relationship\": \"tosca.relationships.nfv.VirtualLinksTo\"}}], \"properties\": {\"descriptor_id\": \"b1bb0ce7-2222-4fa7-95ed-4840d70a1177\", \"software_version\": \"1.0\", \"product_info_name\": \"\", \"template_name\": \"vCPE_vgw\", \"product_info_description\": \"\", \"flavour_description\": \"\", \"monitoring_parameters\": {}, \"flavour_id\": \"simple\", \"default_localization_language\": \"\", \"localization_languages\": {}, \"vnfm_info\": [\"gvnfm\"], \"descriptor_version\": \"1.0\", \"provider\": \"onap\", \"lcm_operations_configuration\": \"\", \"product_name\": \"vcpe_vgw\"}, \"capabilities\": {}, \"metadata\": {\"template_name\": \"vCPE_vgw\", \"VNFD_SCHEMA_VERSION\": \"2.5.1+1\", \"template_version\": \"1.0\", \"template_author\": \"onap\"}}, \"vdus\": [{\"description\": \"\", \"vdu_id\": \"VDU_vgw_0\", \"artifacts\": [{\"artifact_name\": \"sw_image\", \"type\": \"tosca.artifacts.nfv.SwImage\", \"file\": \"../Artifacts/Deployment/OTHER/image\"}], \"dependencies\": [], \"virtual_compute\": {\"virtual_cpu\": {\"num_virtual_cpu\": 2, \"cpu_architecture\": \"generic\"}, \"virtual_memory\": {\"vdu_mem_requirements\": {\"numberOfPages\": \"{\\\"schemaVersion\\\": \\\"0\\\", \\\"schemaSelector\\\": \\\"\\\", \\\"hardwarePlatform\\\": \\\"generic\\\", \\\"mandatory\\\": \\\"true\\\", \\\"configurationValue\\\": \\\"1024\\\"}\", \"memoryPageSize\": \"{\\\"schemaVersion\\\": \\\"0\\\", \\\"schemaSelector\\\": \\\"\\\", \\\"hardwarePlatform\\\": \\\"generic\\\", \\\"mandatory\\\": \\\"true\\\", \\\"configurationValue\\\": \\\"2 MB\\\"}\"}, \"virtual_mem_size\": \"4096 MB\"}, \"virtual_storages\": [{\"size_of_storage\": \"40 GB\"}]}, \"vls\": [\"VL_mux_gw_private_net\", \"VL_cpe_public\"], \"cps\": [\"Cp_vgw_mux_gw_private_net\", \"Cp_vgw_onap_private\", \"Cp_vgw_public\", \"Cp_vgw_cpe_public\"], \"type\": \"tosca.nodes.nfv.Vdu.Compute\", \"properties\": {\"name\": \"zdcpe1cpe01gw01\", \"inject_files\": {\"source_path\": \"../Artifacts/Deployment/OTHER/authorized_keys\", \"source_data_base64\": \"c3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCQVFER3g2U0tyQXVDejFWOEtHZXZa\\ndWVrc0xkV29QV0pQNnozcjI5WjdUbVBWRU9qTSs3UElQZVNzMkJWUngzcm5IWkJBbGFzTXJaK2ZK\\nQlMyNXRzOXZmQytJdGV6UWFoL2hyOXZya213eENSNTRMYjg0cG9XK3NUb1BlRjZpNWVaWTdXK2pX\\nSmZMYUZTRng5ZDJ2cDR6ZXMvZk9sVDNOdllDWGJuLzNRZHJ5UW9HbDdWRkk4b2VtWnlwVmNpa1pY\\nRWxKZWVLZ0FWZFN3bnJ6dXF0Ty90bWJYY0FlU2JZdlZqa2k4eXdZY3NXTVZNWVdVV2hoKzFCQUI2\\na1huVHNJV3F6cnEwUGZ2eSs4MVdEd3RpcXNxbWQ5M0hZOGhFMHNjQnJYRkJaelFTL0FZZklGQmxF\\ndUZOZExjemNobnRqYlowbjdkbURYazh6SHRDWllOazdrd2I4ay8K\\n\", \"dest_path\": \"/home/ubuntu/.ssh/authorized_keys\"}, \"user_data\": \"#!/bin/bash\\nMETADATA=`curl -s http://169.254.169.254/openstack/2012-08-10/meta_data.json`\\napt-get -y install jq\\n\\nget_metadata () {\\n echo $METADATA | jq -r \\\".meta.$1\\\"\\n}\\n\\n# Create configuration files\\nmkdir /opt/config\\necho \\\"$(get_metadata oam_ipaddr)\\\" > /opt/config/oam_ipaddr.txt\\necho \\\"$(get_metadata oam_cidr)\\\" > /opt/config/oam_cidr.txt\\necho \\\"$(get_metadata cpe_public_net_cidr)\\\" > /opt/config/cpe_public_net_cidr.txt\\necho \\\"$(get_metadata mux_gw_private_net_ipaddr)\\\" > /opt/config/mux_gw_private_net_ipaddr.txt\\necho \\\"$(get_metadata mux_gw_private_net_cidr)\\\" > /opt/config/mux_gw_private_net_cidr.txt\\necho \\\"$(get_metadata install_script_version)\\\" > /opt/config/install_script_version.txt\\necho \\\"$(get_metadata cloud_env)\\\" > /opt/config/cloud_env.txt\\necho \\\"$(get_metadata mux_ip_addr)\\\" > /opt/config/mux_ip_addr.txt\\necho \\\"$(get_metadata vg_vgmux_tunnel_vni)\\\" > /opt/config/vg_vgmux_tunnel_vni.txt\\necho \\\"$(get_metadata nexus_artifact_repo)\\\" > /opt/config/nexus_artifact_repo.txt\\n\\n# Download and run install script\\napt-get -y install unzip\\nINSTALL_SCRIPT_VERSION=$(get_metadata install_script_version)\\nNEXUS_ARTIFACT_REPO=$(get_metadata nexus_artifact_repo)\\nif [[ \\\"${INSTALL_SCRIPT_VERSION}\\\" =~ \\\"SNAPSHOT\\\" ]]; then REPO=snapshots; else REPO=releases; fi\\ncurl -k -L \\\"${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vcpe&a=vcpe-scripts&e=zip&v=${INSTALL_SCRIPT_VERSION}\\\" -o /opt/vcpe-scripts-${INSTALL_SCRIPT_VERSION}.zip\\nunzip -j /opt/vcpe-scripts-${INSTALL_SCRIPT_VERSION}.zip -d /opt v_gw_install.sh\\ncd /opt\\nchmod +x v_gw_install.sh\\n./v_gw_install.sh\\n\", \"meta_data\": {\"cpe_public_net_cidr\": \"10.2.0.0/24\", \"vf_module_id\": \"vCPE_Customer_GW\", \"oam_cidr\": \"10.0.0.0/16\", \"mux_gw_private_net_cidr\": \"10.5.0.0/24\", \"oam_ipaddr\": \"10.0.101.30\", \"mux_gw_private_net_ipaddr\": \"10.5.0.21\", \"vg_vgmux_tunnel_vni\": \"100\", \"install_script_version\": \"1.2.0-SNAPSHOT\", \"cloud_env\": \"openstack\", \"mux_ip_addr\": \"10.5.0.20\", \"vnf_id\": \"vCPE_Infrastructure_GW_demo_app\", \"nexus_artifact_repo\": \"https://nexus.onap.org\"}, \"vdu_profile\": {\"max_number_of_instances\": 1, \"watchdog\": \"none\", \"min_number_of_instances\": 1}, \"description\": \"vgw\"}}], \"description\": \"vCPE_vgw\", \"inputs\": {\"cpe_public_net_cidr\": {\"default\": \"10.2.0.0/24\", \"type\": \"string\", \"description\": \"cpe public net cidr\"}, \"vf_module_id\": {\"default\": \"vCPE_Customer_GW\", \"type\": \"string\", \"description\": \"The vCPE Module ID is provided by ONAP\"}, \"install_script_version\": {\"default\": \"1.2.0-SNAPSHOT\", \"type\": \"string\", \"description\": \"install script version number\"}, \"vnf_id\": {\"default\": \"vCPE_Infrastructure_GW_demo_app\", \"type\": \"string\", \"description\": \"The VNF ID is provided by ONAP\"}, \"onap_private_net_id\": {\"default\": \"oam_onap\", \"type\": \"string\", \"description\": \"onap OAM network id\"}, \"mux_gw_private_net_id\": {\"default\": \"shared-sriov\", \"type\": \"string\", \"description\": \"Private network that connects vGMUX to vGWs\"}, \"vcpe_image_name\": {\"default\": \"ubuntu_16.04\", \"type\": \"string\", \"description\": \"image name for vcpe in openstack glance\"}, \"vgw_name_0\": {\"default\": \"zdcpe1cpe01gw01\", \"type\": \"string\", \"description\": \"Name of the vGW\"}, \"onap_private_net_cidr\": {\"default\": \"10.0.0.0/16\", \"type\": \"string\", \"description\": \"oanp OAM network cidr\"}, \"demo_artifacts_version\": {\"default\": \"1.2.0\", \"type\": \"string\", \"description\": \"artifacts version used in demo vnfs\"}, \"mux_ip_addr\": {\"default\": \"10.5.0.20\", \"type\": \"string\", \"description\": \"IP address of vGMUX\"}, \"vgw_private_ip_1\": {\"default\": \"10.0.101.30\", \"type\": \"string\", \"description\": \"Private IP address that is assigned to the vGW to communicate with ONAP components\"}, \"vgw_private_ip_0\": {\"default\": \"10.5.0.21\", \"type\": \"string\", \"description\": \"Private IP address that is assigned to the vGW to communicate with vGMUX\"}, \"dcae_collector_port\": {\"default\": \"8080\", \"type\": \"string\", \"description\": \"dcae collector port\"}, \"vgw_private_ip_2\": {\"default\": \"10.2.0.3\", \"type\": \"string\", \"description\": \"Private IP address that is assigned to the vGW to communicate with vCPE public network\"}, \"mux_gw_private_net_cidr\": {\"default\": \"10.5.0.0/24\", \"type\": \"string\", \"description\": \"he CIDR of the vGMUX private network\"}, \"vg_vgmux_tunnel_vni\": {\"default\": \"100\", \"type\": \"string\", \"description\": \"vni value of vG-vGMUX vxlan tunnel\"}, \"public_net_id\": {\"default\": \"external\", \"type\": \"string\", \"description\": \"public network id used during onap installation\"}, \"dcae_collector_ip\": {\"default\": \"10.0.4.102\", \"type\": \"string\", \"description\": \"dcae collector ip\"}, \"cloud_env\": {\"default\": \"openstack\", \"type\": \"string\", \"description\": \"cloud environment(openstack or rackspace)\"}, \"pub_key\": {\"default\": \"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGx6SKrAuCz1V8KGevZueksLdWoPWJP6z3r29Z7TmPVEOjM+7PIPeSs2BVRx3rnHZBAlasMrZ+fJBS25ts9vfC+ItezQah/hr9vrkmwxCR54Lb84poW+sToPeF6i5eZY7W+jWJfLaFSFx9d2vp4zes/fOlT3NvYCXbn/3QdryQoGl7VFI8oemZypVcikZXElJeeKgAVdSwnrzuqtO/tmbXcAeSbYvVjki8ywYcsWMVMYWUWhh+1BAB6kXnTsIWqzrq0Pfvy+81WDwtiqsqmd93HY8hE0scBrXFBZzQS/AYfIFBlEuFNdLczchntjbZ0n7dmDXk8zHtCZYNk7kwb8k/\", \"type\": \"string\", \"description\": \"ssh public key\"}, \"cpe_public_net_id\": {\"default\": \"oam_zte\", \"type\": \"string\", \"description\": \"cpe public net name\"}, \"nexus_artifact_repo\": {\"default\": \"https://nexus.onap.org\", \"type\": \"string\", \"description\": \"Root URL for the Nexus repository for Maven artifacts\"}}, \"graph\": {\"VL_cpe_public\": [\"Cp_vgw_cpe_public\"], \"VL_mux_gw_private_net\": [\"Cp_vgw_mux_gw_private_net\"], \"Cp_vgw_mux_gw_private_net\": [], \"Cp_vgw_onap_private\": [], \"Cp_vgw_public\": [], \"VDU_vgw_0\": [\"Cp_vgw_public\", \"Cp_vgw_onap_private\", \"Cp_vgw_mux_gw_private_net\", \"Cp_vgw_cpe_public\"], \"Cp_vgw_cpe_public\": [], \"LLU_VNF\": []}, \"basepath\": \"/tmp/tmpvutEO9/Definitions\", \"vnf_exposed\": {\"external_cps\": [{\"key_name\": \"virtual_link_public\", \"cpd_id\": {\"capability\": \"tosca.capabilities.nfv.VirtualLinkable\", \"occurrences\": [0, 1], \"relationship\": \"tosca.relationships.nfv.VirtualLinksTo\"}}, {\"key_name\": \"virtual_link_private\", \"cpd_id\": {\"capability\": \"tosca.capabilities.nfv.VirtualLinkable\", \"occurrences\": [0, 1], \"relationship\": \"tosca.relationships.nfv.VirtualLinksTo\"}}], \"forward_cps\": []}, \"vls\": [{\"vl_id\": \"VL_cpe_public\", \"description\": \"\", \"properties\": {\"connectivity_type\": {\"layer_protocols\": [\"ipv4\"], \"layer_protocol\": [\"ipv4\"]}, \"vl_profile\": {\"min_bitrate_requirements\": {\"root\": 10000000, \"leaf\": 10000000}, \"max_bit_rate_requirements\": {\"root\": 10000000, \"leaf\": 10000000}, \"virtual_link_protocol_data\": [{\"l3_protocol_data\": {\"ip_version\": \"ipv4\", \"cidr\": \"10.2.0.0/24\", \"name\": \"oam_zte\", \"dhcp_enabled\": false}, \"associated_layer_protocol\": \"ipv4\"}], \"min_bit_rate_requirements\": {\"root\": 10000000, \"leaf\": 10000000}, \"associated_layer_protocol\": \"ipv4\", \"max_bitrate_requirements\": {\"root\": 10000000, \"leaf\": 10000000}, \"ip_version\": \"ipv4\", \"cidr\": \"10.2.0.0/24\", \"networkName\": \"oam_zte\", \"dhcpEnabled\": false}}}, {\"vl_id\": \"VL_mux_gw_private_net\", \"description\": \"\", \"properties\": {\"connectivity_type\": {\"layer_protocols\": [\"ipv4\"], \"layer_protocol\": [\"ipv4\"]}, \"vl_profile\": {\"physicalNetwork\": \"shared-1\", \"min_bitrate_requirements\": {\"root\": 10000000, \"leaf\": 10000000}, \"max_bit_rate_requirements\": {\"root\": 10000000, \"leaf\": 10000000}, \"virtual_link_protocol_data\": [{\"l3_protocol_data\": {\"ip_version\": \"ipv4\", \"cidr\": \"10.5.0.0/24\", \"name\": \"shared-sriov\", \"dhcp_enabled\": false}, \"l2_protocol_data\": {\"physical_network\": \"shared-1\"}, \"associated_layer_protocol\": \"ipv4\"}], \"min_bit_rate_requirements\": {\"root\": 10000000, \"leaf\": 10000000}, \"associated_layer_protocol\": \"ipv4\", \"max_bitrate_requirements\": {\"root\": 10000000, \"leaf\": 10000000}, \"ip_version\": \"ipv4\", \"cidr\": \"10.5.0.0/24\", \"networkName\": \"shared-sriov\", \"dhcpEnabled\": false}}}], \"cps\": [{\"vl_id\": \"VL_mux_gw_private_net\", \"description\": \"\", \"vdu_id\": \"VDU_vgw_0\", \"properties\": {\"vnic_type\": \"direct\", \"virtual_network_interface_requirements\": [{\"network_interface_requirements\": {\"interfaceType\": \"{\\\"schemaVersion\\\": \\\"0\\\", \\\"schemaSelector\\\": \\\"\\\", \\\"hardwarePlatform\\\": \\\"generic\\\", \\\"mandatory\\\": \\\"true\\\", \\\"configurationValue\\\": \\\"SR-IOV\\\"}\"}, \"support_mandatory\": true, \"name\": \"sriov-support\", \"nic_io_requirements\": {\"logical_node_requirements\": {\"pciVendorId\": \"{\\\"schemaVersion\\\": \\\"0\\\", \\\"schemaSelector\\\": \\\"\\\", \\\"hardwarePlatform\\\": \\\"generic\\\", \\\"mandatory\\\": \\\"true\\\", \\\"configurationValue\\\": \\\"1234\\\"}\", \"pciNumDevices\": \"{\\\"schemaVersion\\\": \\\"0\\\", \\\"schemaSelector\\\": \\\"\\\", \\\"hardwarePlatform\\\": \\\"generic\\\", \\\"mandatory\\\": \\\"true\\\", \\\"configurationValue\\\": \\\"1\\\"}\", \"pciDeviceId\": \"{\\\"schemaVersion\\\": \\\"0\\\", \\\"schemaSelector\\\": \\\"\\\", \\\"hardwarePlatform\\\": \\\"generic\\\", \\\"mandatory\\\": \\\"true\\\", \\\"configurationValue\\\": \\\"5678\\\"}\"}}}], \"layer_protocol\": [\"ipv4\"], \"protocol_data\": [{\"asscociated_layer_protocol\": \"ipv4\", \"address_data\": {\"address_type\": \"ip_address\", \"l3_address_data\": {\"floating_ip_activated\": false, \"fixed_ip_address\": [\"10.5.0.21\"], \"ip_address_assignment\": false}}, \"associated_layer_protocol\": \"ipv4\"}], \"trunk_mode\": \"false\"}, \"cp_id\": \"Cp_vgw_mux_gw_private_net\", \"cpd_id\": \"Cp_vgw_mux_gw_private_net\"}, {\"vl_id\": \"\", \"description\": \"\", \"vdu_id\": \"VDU_vgw_0\", \"properties\": {\"layer_protocol\": [\"ipv4\"], \"protocol_data\": [{\"asscociated_layer_protocol\": \"ipv4\", \"address_data\": {\"address_type\": \"ip_address\", \"l3_address_data\": {\"floating_ip_activated\": false, \"fixed_ip_address\": [\"10.0.101.30\"], \"ip_address_assignment\": false}}, \"associated_layer_protocol\": \"ipv4\"}], \"trunk_mode\": \"false\"}, \"cp_id\": \"Cp_vgw_onap_private\", \"cpd_id\": \"Cp_vgw_onap_private\"}, {\"vl_id\": \"\", \"description\": \"\", \"vdu_id\": \"VDU_vgw_0\", \"properties\": {\"layer_protocol\": [\"ipv4\"], \"protocol_data\": [{\"asscociated_layer_protocol\": \"ipv4\", \"address_data\": {\"address_type\": \"ip_address\", \"l3_address_data\": {\"floating_ip_activated\": false, \"ip_address_assignment\": false}}, \"associated_layer_protocol\": \"ipv4\"}], \"trunk_mode\": \"false\"}, \"cp_id\": \"Cp_vgw_public\", \"cpd_id\": \"Cp_vgw_public\"}, {\"vl_id\": \"VL_cpe_public\", \"description\": \"\", \"vdu_id\": \"VDU_vgw_0\", \"properties\": {\"layer_protocol\": [\"ipv4\"], \"protocol_data\": [{\"asscociated_layer_protocol\": \"ipv4\", \"address_data\": {\"address_type\": \"ip_address\", \"l3_address_data\": {\"floating_ip_activated\": false, \"fixed_ip_address\": [\"10.2.0.3\"], \"ip_address_assignment\": false}}, \"associated_layer_protocol\": \"ipv4\"}], \"trunk_mode\": \"false\"}, \"cp_id\": \"Cp_vgw_cpe_public\", \"cpd_id\": \"Cp_vgw_cpe_public\"}], \"metadata\": {\"template_name\": \"vCPE_vgw\", \"VNFD_SCHEMA_VERSION\": \"2.5.1+1\", \"template_version\": \"1.0\", \"template_author\": \"onap\"}}", + "downloadUrl" : "http://10.42.3.30:8806/static/catalog/a8571488-d72d-4d9f-b534-4e7380390175/vgw.csar" + }, + "imageInfo" : [ ] + }, { + "csarId" : "ae2a4458-de56-4513-a44c-1edb34942f78", + "packageInfo" : { + "vnfdId" : null, + "vnfPackageId" : "ae2a4458-de56-4513-a44c-1edb34942f78", + "vnfdProvider" : null, + "vnfdVersion" : null, + "vnfVersion" : null, + "csarName" : null, + "vnfdModel" : null, + "downloadUrl" : "http://10.42.3.30:8806/static/catalog/ae2a4458-de56-4513-a44c-1edb34942f78/None" + }, + "imageInfo" : [ ] + }, { + "csarId" : "d328c91f-72ef-453a-a3b4-db66ffc90226", + "packageInfo" : { + "vnfdId" : null, + "vnfPackageId" : "d328c91f-72ef-453a-a3b4-db66ffc90226", + "vnfdProvider" : null, + "vnfdVersion" : null, + "vnfVersion" : null, + "csarName" : null, + "vnfdModel" : null, + "downloadUrl" : "http://10.42.3.30:8806/static/catalog/d328c91f-72ef-453a-a3b4-db66ffc90226/None" }, "imageInfo" : [ ] - } + } ] } } ]
\ No newline at end of file diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-vnf-schema-sample.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-vnf-schema-sample.yaml index ba22e24a..1fd8871b 100644 --- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-vnf-schema-sample.yaml +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-vnf-schema-sample.yaml @@ -1,14 +1,30 @@ open_cli_sample_version: 1.0 -name: vfc-catalog-get-vnf +name: -m version: onap-dublin samples: sample1: - name: vfc-catalog-get-vnf - input: -m http://10.12.5.155:30280 -c af59a474-6391-4500-989c-f78df18d77f0 + name: -m + input: http://10.12.5.155:30280 moco: vfc-catalog-get-vnf-schema-moco.json output: | - +--------------------------------------+--------------------------------------+----------------+--------------+--------------+----------------+ - |vnfd-id |vnf-package-id |vnfd-provider |vnfd-version |vnf-version |csar-name | - +--------------------------------------+--------------------------------------+----------------+--------------+--------------+----------------+ - |0408f076-e6c0-4c82-9940-272fddbb82de |af59a474-6391-4500-989c-f78df18d77f0 |onap |1.0 |1.0.0 |tst_vgmux.csar | - +--------------------------------------+--------------------------------------+----------------+--------------+--------------+----------------+ + +--------------------------------------+ + |csar-id | + +--------------------------------------+ + |09d355fb-83d6-4f91-ba8a-199ef7d24dc7 | + +--------------------------------------+ + |24d97292-0845-49ed-9d9d-2ffa927c783f | + +--------------------------------------+ + |6eb437ba-e295-4139-bac9-6bf857fd5629 | + +--------------------------------------+ + |7e9385be-497a-4707-a530-1274df12eb9b | + +--------------------------------------+ + |905e4a2f-5f24-4253-aa76-b293a7c2e52f | + +--------------------------------------+ + |965cb252-788f-4e24-ba92-089866d47d37 | + +--------------------------------------+ + |a8571488-d72d-4d9f-b534-4e7380390175 | + +--------------------------------------+ + |ae2a4458-de56-4513-a44c-1edb34942f78 | + +--------------------------------------+ + |d328c91f-72ef-453a-a3b4-db66ffc90226 | + +--------------------------------------+ diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-create-schema-moco.json b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-create-schema-moco.json index 05a1b84e..07392582 100644 --- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-create-schema-moco.json +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-create-schema-moco.json @@ -17,4 +17,4 @@ "nsInstanceId" : "25f3159c-ff2d-4ad0-ac66-3270941bfa52" } } -} ]
\ No newline at end of file +} ] diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-create-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-create-schema.yaml index 0577d30f..efdbb88b 100644 --- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-create-schema.yaml +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-create-schema.yaml @@ -34,6 +34,18 @@ parameters: short_option: n long_option: ns-csar-name is_optional: false + - name: customer-name + description: customer name + type: string + short_option: q + long_option: customer-name + is_optional: false + - name: service-type + description: service type + type: string + short_option: S + long_option: service-type + is_optional: false results: direction: landscape @@ -52,7 +64,8 @@ http: method: POST context: remove_empty_node: true - body: '{"csarId": "${ns-csar-uuid}", "nsName": "${ns-csar-name}"}' + body: '{"context": {"globalCustomerId": ${customer-name}, "serviceType": ${service-type}}, + "csarId": "${ns-csar-uuid}", "nsName": "${ns-csar-name}"}' headers: Content-Type: application/json Accept: application/json diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-get-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-get-schema.yaml index 2983d185..d6fa4398 100644 --- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-get-schema.yaml +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-get-schema.yaml @@ -21,14 +21,6 @@ info: service: vfc author: ONAP HPA Integration Team (haibin.huang@intel.com) -parameters: - - name: ns-instance-id - description: ns's instance id - type: string - short_option: c - long_option: ns-instance-id - is_optional: false - results: direction: landscape attributes: @@ -54,7 +46,7 @@ http: auth: none mode: direct request: - uri: /api/nslcm/v1/ns/${ns-instance-id} + uri: /api/nslcm/v1/ns method: GET context: remove_empty_node: true diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-terminate-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-terminate-schema.yaml new file mode 100644 index 00000000..19f68666 --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-terminate-schema.yaml @@ -0,0 +1,56 @@ +# Copyright © Intel Corporation 2019 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +open_cli_schema_version: 1.0 +name: vfc-nslcm-terminate +description: vfc nslcm terminate ns + +info: + product: onap-dublin + service: vfc + author: ONAP HPA Integration Team (haibin.huang@intel.com) + +parameters: + - name: ns-instance-id + description: ns's instance id + type: string + short_option: i + long_option: ns-instance-id + is_optional: false + +results: + direction: landscape + attributes: + - name: job-id + description: job id + scope: short + type: string + +http: + service: + auth: none + mode: direct + request: + uri: /api/nslcm/v1/ns/${ns-instance-id}/terminate + method: POST + context: + remove_empty_node: true + body: '{}' + headers: + Content-Type: application/json + Accept: application/json + success_codes: + - 202 + result_map: + job-id: $b{$.jobId} |