diff options
author | Haibin Huang <haibin.huang@intel.com> | 2019-03-21 10:57:23 +0800 |
---|---|---|
committer | Haibin Huang <haibin.huang@intel.com> | 2019-03-21 11:01:50 +0800 |
commit | dfed2843d00ad6ee5014393745f21282baec9a8b (patch) | |
tree | 09afd6c5c4942778f8bdd8478daf31de7f04c898 | |
parent | 618482352bbfdfb225bdee0ba377a4ab71ce5135 (diff) |
Add vfc catalog operation in onap dublin
Change-Id: Ia1e76629cfc5176a8e7aae193a0bffb3c1766d2e
Issue-ID: CLI-149
Signed-off-by: Haibin Huang <haibin.huang@intel.com>
14 files changed, 545 insertions, 0 deletions
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 new file mode 100644 index 00000000..899b306d --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-ns-schema-moco.json @@ -0,0 +1,27 @@ +[ { + "request" : { + "method" : "get", + "uri" : "/api/catalog/v1/nspackages/a3394090-c5b4-49b4-974c-00a6eac755ab", + "headers" : { + "Accept" : "application/json", + "Content-Type" : "application/json" + }, + "json" : { } + }, + "response" : { + "status" : 200, + "json" : { + "csarId" : "a3394090-c5b4-49b4-974c-00a6eac755ab", + "packageInfo" : { + "nsdInvariantId" : "c3887fb3-d1b2-477f-86c4-fd641ee9a7cf", + "csarName" : "/service/vfc/nfvo/catalog/static/catalog/a3394090-c5b4-49b4-974c-00a6eac755ab/Artifacts/Deployment/OTHER/ns.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\"}}", + "nsdVersion" : "1.0.0" + } + } + } +} ]
\ 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 new file mode 100644 index 00000000..afc4f3fd --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-ns-schema-sample.yaml @@ -0,0 +1,16 @@ +open_cli_sample_version: 1.0 +name: vfc-catalog-get-ns +version: onap-dublin +samples: + sample1: + name: vfc-catalog-get-ns + input: -m http://10.12.5.155:30280 -c a3394090-c5b4-49b4-974c-00a6eac755ab + 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 | + +--------------------------------------+--------------------------------------+--------------+--------------------------------------+----------------------------------------------------+ 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 new file mode 100644 index 00000000..fa1cc5dd --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-vnf-schema-moco.json @@ -0,0 +1,28 @@ +[ { + "request" : { + "method" : "get", + "uri" : "/api/catalog/v1/vnfpackages/af59a474-6391-4500-989c-f78df18d77f0", + "headers" : { + "Accept" : "application/json", + "Content-Type" : "application/json" + }, + "json" : { } + }, + "response" : { + "status" : 200, + "json" : { + "csarId" : "af59a474-6391-4500-989c-f78df18d77f0", + "packageInfo" : { + "vnfdId" : "0408f076-e6c0-4c82-9940-272fddbb82de", + "vnfPackageId" : "af59a474-6391-4500-989c-f78df18d77f0", + "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" + }, + "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 new file mode 100644 index 00000000..ba22e24a --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-vnf-schema-sample.yaml @@ -0,0 +1,14 @@ +open_cli_sample_version: 1.0 +name: vfc-catalog-get-vnf +version: onap-dublin +samples: + sample1: + name: vfc-catalog-get-vnf + input: -m http://10.12.5.155:30280 -c af59a474-6391-4500-989c-f78df18d77f0 + 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 | + +--------------------------------------+--------------------------------------+----------------+--------------+--------------+----------------+ diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-onboard-ns-schema-moco.json b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-onboard-ns-schema-moco.json new file mode 100644 index 00000000..5218f7fd --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-onboard-ns-schema-moco.json @@ -0,0 +1,21 @@ +[ { + "request" : { + "method" : "post", + "uri" : "/api/catalog/v1/nspackages", + "headers" : { + "Accept" : "application/json", + "Content-Type" : "application/json" + }, + "json" : { + "csarId" : "a3394090-c5b4-49b4-974c-00a6eac755ab" + } + }, + "response" : { + "status" : 202, + "json" : { + "status" : "success", + "errorCode" : "", + "statusDescription" : "CSAR(a3394090-c5b4-49b4-974c-00a6eac755ab) distributed successfully." + } + } +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-onboard-ns-schema-sample.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-onboard-ns-schema-sample.yaml new file mode 100644 index 00000000..c714a59a --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-onboard-ns-schema-sample.yaml @@ -0,0 +1,15 @@ +open_cli_sample_version: 1.0 +name: vfc-catalog-onboard-ns +version: onap-dublin +samples: + sample1: + name: vfc-catalog-onboard-ns + input: -m http://10.12.5.155:30280 -c a3394090-c5b4-49b4-974c-00a6eac755ab + moco: vfc-catalog-onboard-ns-schema-moco.json + output: | + +----------+----------------------------------------------+ + |status |status-desc | + +----------+----------------------------------------------+ + |success |CSAR(a3394090-c5b4-49b4-974c-00a6eac755ab) | + | |distributed successfully. | + +----------+----------------------------------------------+ diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-onboard-vnf-schema-moco.json b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-onboard-vnf-schema-moco.json new file mode 100644 index 00000000..5e0591de --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-onboard-vnf-schema-moco.json @@ -0,0 +1,19 @@ +[ { + "request" : { + "method" : "post", + "uri" : "/api/catalog/v1/vnfpackages", + "headers" : { + "Accept" : "application/json", + "Content-Type" : "application/json" + }, + "json" : { + "csarId" : "c1cec675-1069-487d-b1a9-c256b17c3291" + } + }, + "response" : { + "status" : 202, + "json" : { + "jobId" : "1d871fc4-380c-4699-8f7f-77e508f9734d" + } + } +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-onboard-vnf-schema-sample.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-onboard-vnf-schema-sample.yaml new file mode 100644 index 00000000..0fd0d0f6 --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-onboard-vnf-schema-sample.yaml @@ -0,0 +1,14 @@ +open_cli_sample_version: 1.0 +name: vfc-catalog-onboard-vnf +version: onap-dublin +samples: + sample1: + name: vfc-catalog-onboard-vnf + input: -m http://10.12.5.155:30280 -c c1cec675-1069-487d-b1a9-c256b17c3291 + moco: vfc-catalog-onboard-vnf-schema-moco.json + output: | + +--------------------------------------+ + |job-id | + +--------------------------------------+ + |1d871fc4-380c-4699-8f7f-77e508f9734d | + +--------------------------------------+ diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-delete-ns-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-delete-ns-schema.yaml new file mode 100644 index 00000000..f12d0af7 --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-delete-ns-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-catalog-delete-ns +description: vfc delete onboard ns from catalog of vfc + +info: + product: onap-dublin + service: vfc + author: ONAP HPA Integration Team (haibin.huang@intel.com) + +parameters: + - name: ns-csar-uuid + description: ns's uuid of csar file + type: string + short_option: c + long_option: ns-csar-uuid + 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/catalog/v1/nspackages/${ns-csar-uuid} + method: DELETE + context: + remove_empty_node: true + body: '{}' + headers: + Content-Type: application/json + Accept: application/json + success_codes: + - 200 + result_map: + job-id: $b{$.jobId} diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-delete-vnf-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-delete-vnf-schema.yaml new file mode 100644 index 00000000..406ece6c --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-delete-vnf-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-catalog-delete-vnf +description: vfc delete onboard vnf to catalog of vfc + +info: + product: onap-dublin + service: vfc + author: ONAP HPA Integration Team (haibin.huang@intel.com) + +parameters: + - name: vnf-csar-uuid + description: vnf's uuid of csar file + type: string + short_option: c + long_option: vnf-csar-uuid + 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/catalog/v1/vnfpackages/${vnf-csar-uuid} + method: DELETE + context: + remove_empty_node: true + body: '{}' + headers: + Content-Type: application/json + Accept: application/json + success_codes: + - 200 + result_map: + job-id: $b{$.jobId} diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-get-ns-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-get-ns-schema.yaml new file mode 100644 index 00000000..71737261 --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-get-ns-schema.yaml @@ -0,0 +1,81 @@ +# 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-catalog-get-ns +description: vfc get onboard ns status + +info: + product: onap-dublin + service: vfc + author: ONAP HPA Integration Team (haibin.huang@intel.com) + +parameters: + - name: ns-csar-uuid + description: ns's uuid of csar file + type: string + short_option: c + long_option: ns-csar-uuid + is_optional: false + +results: + direction: landscape + attributes: + - name: nsd-invariant-id + description: nsd-invariant-id + scope: short + type: string + - name: ns-package-id + description: ns-package-id + scope: short + type: string + - name: nsd-provider + description: nsd-provider + scope: short + type: string + - name: nsd-id + description: nsd-id + scope: short + type: string + - name: download-url + description: download-url + scope: long + type: string + - name: csar-name + description: csar-name + scope: short + type: string + +http: + service: + auth: none + mode: direct + request: + uri: /api/catalog/v1/nspackages/${ns-csar-uuid} + method: GET + context: + remove_empty_node: true + body: '{}' + headers: + Content-Type: application/json + Accept: application/json + success_codes: + - 200 + result_map: + nsd-id: $b{$.packageInfo.nsdId} + ns-package-id: $b{$.packageInfo.nsPackageId} + nsd-provider: $b{$.packageInfo.nsdProvider} + nsd-invariant-id: $b{$.packageInfo.nsdInvariantId} + download-url: $b{$.packageInfo.downloadUrl} + csar-name: $b{$.packageInfo.csarName} diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-get-vnf-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-get-vnf-schema.yaml new file mode 100644 index 00000000..2727b52f --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-get-vnf-schema.yaml @@ -0,0 +1,81 @@ +# 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-catalog-get-vnf +description: vfc get onboard vnf status + +info: + product: onap-dublin + service: vfc + author: ONAP HPA Integration Team (haibin.huang@intel.com) + +parameters: + - name: vnf-csar-uuid + description: vnf's uuid of csar file + type: string + short_option: c + long_option: vnf-csar-uuid + is_optional: false + +results: + direction: landscape + attributes: + - name: vnfd-id + description: vnfd-id + scope: short + type: string + - name: vnf-package-id + description: vnf-package-id + scope: short + type: string + - name: vnfd-provider + description: vnfd-provider + scope: short + type: string + - name: vnfd-version + description: vnfd-version + scope: short + type: string + - name: vnf-version + description: vnf-version + scope: short + type: string + - name: csar-name + description: csar-name + scope: short + type: string + +http: + service: + auth: none + mode: direct + request: + uri: /api/catalog/v1/vnfpackages/${vnf-csar-uuid} + method: GET + context: + remove_empty_node: true + body: '{}' + headers: + Content-Type: application/json + Accept: application/json + success_codes: + - 200 + result_map: + vnfd-id: $b{$.packageInfo.vnfdId} + vnf-package-id: $b{$.packageInfo.vnfPackageId} + vnfd-provider: $b{$.packageInfo.vnfdProvider} + vnfd-version: $b{$.packageInfo.vnfdVersion} + vnf-version: $b{$.packageInfo.vnfVersion} + csar-name: $b{$.packageInfo.csarName} diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-onboard-ns-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-onboard-ns-schema.yaml new file mode 100644 index 00000000..11b027db --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-onboard-ns-schema.yaml @@ -0,0 +1,61 @@ +# 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-catalog-onboard-ns +description: vfc onboard ns to catalog of vfc + +info: + product: onap-dublin + service: vfc + author: ONAP HPA Integration Team (haibin.huang@intel.com) + +parameters: + - name: ns-csar-uuid + description: ns's uuid of csar file + type: string + short_option: c + long_option: ns-csar-uuid + is_optional: false + +results: + direction: landscape + attributes: + - name: status + description: status + scope: short + type: string + - name: status-desc + description: status-desc + scope: short + type: string + +http: + service: + auth: none + mode: direct + request: + uri: /api/catalog/v1/nspackages + method: POST + context: + remove_empty_node: true + body: '{"csarId": "${ns-csar-uuid}"}' + headers: + Content-Type: application/json + Accept: application/json + success_codes: + - 202 + result_map: + status: $b{$.status} + status-desc: $b{$.statusDescription} diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-onboard-vnf-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-onboard-vnf-schema.yaml new file mode 100644 index 00000000..d7cdfdc6 --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-onboard-vnf-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-catalog-onboard-vnf +description: vfc onboard vnf to catalog of vfc + +info: + product: onap-dublin + service: vfc + author: ONAP HPA Integration Team (haibin.huang@intel.com) + +parameters: + - name: vnf-csar-uuid + description: vnf's uuid of csar file + type: string + short_option: c + long_option: vnf-csar-uuid + 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/catalog/v1/vnfpackages + method: POST + context: + remove_empty_node: true + body: '{"csarId": "${vnf-csar-uuid}"}' + headers: + Content-Type: application/json + Accept: application/json + success_codes: + - 202 + result_map: + job-id: $b{$.jobId} |