diff options
10 files changed, 201 insertions, 28 deletions
@@ -5,6 +5,7 @@ data/ build/ dist/ ocomp.egg-info/ +.pydevproject .project .settings .classpath diff --git a/framework/src/test/java/org/onap/cli/fw/utils/ProcessRunnerTest.java b/framework/src/test/java/org/onap/cli/fw/utils/ProcessRunnerTest.java index 2e5b2ab9..6d7ebbf9 100644 --- a/framework/src/test/java/org/onap/cli/fw/utils/ProcessRunnerTest.java +++ b/framework/src/test/java/org/onap/cli/fw/utils/ProcessRunnerTest.java @@ -39,7 +39,7 @@ public class ProcessRunnerTest { public void testStreamToString() throws IOException { InputStream stubInputStream = IOUtils.toInputStream("Test stream", "UTF-8"); String out = processRunner.streamToString(stubInputStream); - Assert.assertEquals("Test stream\n", out); + Assert.assertEquals("Test stream", out.trim()); } } diff --git a/products/onap-dublin/features/integration/src/main/resources/conf/vnf-tosca-provision.json b/products/onap-dublin/features/integration/src/main/resources/conf/vnf-tosca-provision.json index 45aa7d1f..a944e373 100644 --- a/products/onap-dublin/features/integration/src/main/resources/conf/vnf-tosca-provision.json +++ b/products/onap-dublin/features/integration/src/main/resources/conf/vnf-tosca-provision.json @@ -42,11 +42,11 @@ "service-type": "tosca_vnf_validation" }, "vnf": { - "vendor-name" : "vnf-vendor-kanag", - "name": "vgwvnfovpdemo", - "vsp-csar": "C:\\Users\\k00365106\\Desktop\\vtp\\tosca-lcm\\csar\\vgw.csar", - "vnf-csar": "C:\\Users\\k00365106\\Desktop\\vtp\\tosca-lcm\\csar\\vnf_vgw.csar", - "ns-csar": "C:\\Users\\k00365106\\Desktop\\vtp\\tosca-lcm\\csar\\ns.csar", + "vendor-name" : "vgw-vendor", + "name": "vgw", + "vsp-csar": "D:\\workspace\\onap\\1.1\\SOL001\\vCPE\\csar_files\\default\\vgw.csar", + "vnf-csar": "D:\\workspace\\onap\\1.1\\SOL001\\vCPE_VFC\\csar_files\\default\\vgw.csar", + "ns-csar": "D:\\workspace\\onap\\1.1\\SOL001\\vCPE_VFC\\csar_files\\default\\ns.csar", "vnfm-driver": "hwvnfmdriver" }, "cloud": { diff --git a/products/onap-dublin/features/integration/src/main/resources/open-cli-schema/vnf-tosca-provision-dublin-schema.yaml b/products/onap-dublin/features/integration/src/main/resources/open-cli-schema/vnf-tosca-provision-dublin-schema.yaml index 908d33dc..e7c509a6 100644 --- a/products/onap-dublin/features/integration/src/main/resources/open-cli-schema/vnf-tosca-provision-dublin-schema.yaml +++ b/products/onap-dublin/features/integration/src/main/resources/open-cli-schema/vnf-tosca-provision-dublin-schema.yaml @@ -16,22 +16,87 @@ open_cli_schema_version: 1.0 name: vnf-tosca-provision description: | ONAP TOSCA VNF validation using ONAP CLI and Open Command Platform (OCOMP) - NOTE: Before using this command, configure the $OPEN_CLI_HOME/conf/vnf-tosca-provision.json - This command runs in 4 mode: - 1. setup: Create requires Vendor, Service Subscription and VNF cloud in ONAP - 2. standup: From the given VSP csar, VNF csar and NS csar, it creates VF Model, NS Model and NS service - 3. cleanup: Remove those entries provided in onap-objects parameter - 4. validate: Run setup -> standup -> cleanup + This command runs in 5 mode: + 1. setup: Create requires Vendor, Service Subscription and VNF cloud in ONAP + 2. standup: From the given VSP csar, VNF csar and NS csar, it creates VF Model, NS Model and NS service + 3. cleanup: Remove those entries provided in onap-objects parameter + 4. provision:Run setup -> standup + 5. validate: Run setup -> standup -> cleanup On every execution, it reports the ONAP managed object's ids in result onap-objects attribute. so if requires, these attribute value could be passed in input parameter onap-objects on subsequent executions to avoid recreation of these ONA managed objects + prerequisites + ------------- + 1. Setup the OCOMP profile to configure the ONAP service URL and creadentials as given below + + a. Run command 'oclip' to go to OCOMP interactive mode + + b. Type 'use onap-dublin' to choose the onap-dublin product + + c. Type 'profile onap-dublin' to create or to use existing onap-dublin profile + + d. Set following entries: + set sdc.onboarding:host-url=https://159.138.8.8:30280 + set sdc.onboarding:host-username=cs0008 + set sdc.onboarding:host-password=demo123456! + set sdc.catalog:host-url=https://159.138.8.8:30205 + set sdc.catalog:host-password=demo123456\! + set sdc.catalog:host-username=cs0008 + set sdc.catalog:service-model-approve:host-username=gv0001 + set sdc.catalog:service-model-distribute:host-username=op0001 + set sdc.catalog:service-model-test-start:host-username=jm0007 + set sdc.catalog:service-model-test-accept:host-username=jm0007 + set sdc.catalog:service-model-add-artifact:host-username=ocomp + set sdc.catalog:vf-model-add-artifact:host-username=ocomp + set aai:host-url=https://159.138.8.8:30233 + set aai:host-username=AAI + set aai:host-password=AAI + set vfc:host-url=http://159.138.8.8:30280 + set multicloud:host-url=http://159.138.8.8:30280 + + NOTE: + By default, SDC onboarding service does not provide node port, which is available to access from external ONAP network. + so to enable for external access, register the SDC onboarding service into MSB and use MSB url for sdc.onboarding:host-url. + + oclip --product onap-dublin microservice-create --host-url http://159.138.8.8:30280 --service-name sdcob --service-version v1.0 --service-url /onboarding-api/v1.0 --path /onboarding-api/v1.0 --node-ip 172.16.1.0 --node-port 8081 + + oclip --product onap-dublin microservice-create --host-url http://159.138.8.8:30280 --service-name sdcobs --service-version v1.0 --service-url /onboarding-api/v1.0 --path /onboarding-api/v1.0 --node-ip 172.16.1.0 --node-port 8445 --enable-ssl + + Find out SDC onboarding service IP and port details as given here: + [root@onap-dublin-vfw-93996-50c1z ~]# kubectl get pods -n onap -o wide | grep sdc-onboarding-be + dev-sdc-sdc-onboarding-be-5564b877c8-vpwr5 2/2 Running 0 29d 172.16.1.0 192.168.2.163 <none> <none> + dev-sdc-sdc-onboarding-be-cassandra-init-mtvz6 0/1 Completed 0 29d 172.16.0.220 192.168.2.163 <none> <none> + [root@onap-dublin-vfw-93996-50c1z ~]# + + Note down the IP address for sdc-onboarding-be 172.16.1.0 + + [root@onap-dublin-vfw-93996-50c1z ~]# kubectl get services -n onap -o wide | grep sdc-onboarding-be + sdc-onboarding-be ClusterIP 10.247.198.92 <none> 8445/TCP,8081/TCP 29d app=sdc-onboarding-be,release=dev-sdc + [root@onap-dublin-vfw-93996-50c1z ~]# + + Note down the port for sdc-onboarding-be 8445 8081 + + Similarly, other service IP and Port could be discovered like above, in case not know earlier :) + + This profile would be used while running the command with ONAP setup configured in it, as below + oclip --profile onap-dublin vnf-tosca-provision ..... + + e. Verify these details once by typing 'set' + + f. Exit from the interactive console by typing 'exit' + + 2. Setup SDC consumer + oclip --product onap-dublin --profile onap-dublin sdc-consumer-create --consumer-name ocomp + + 3. Update the cloud and vnfm driver details in the configuration file $OPEN_CLI_HOME/conf/vnf-tosca-provision.json + info: product: onap-dublin service: vnf-validation - author: ONAP VTP Team onap-discuss@lists.onap.org + author: ONAP VTP Team kanagaraj.manickam@huawei.com parameters: - name: config-json @@ -74,12 +139,12 @@ parameters: is_optional: true default_value: {} - name: mode - description: setup or standup or cleanup + description: setup or standup or cleanup or provision or validate type: string short_option: Y long_option: mode is_optional: true - default_value: validate + default_value: checkup - name: vnf-name description: VNF Name type: string diff --git a/products/onap-dublin/features/integration/src/main/resources/script/vnf-tosca-provision.py b/products/onap-dublin/features/integration/src/main/resources/script/vnf-tosca-provision.py index 6dc7310e..0dd7ab5b 100644 --- a/products/onap-dublin/features/integration/src/main/resources/script/vnf-tosca-provision.py +++ b/products/onap-dublin/features/integration/src/main/resources/script/vnf-tosca-provision.py @@ -126,7 +126,7 @@ class ONAP: self.conf = conf self.ocomp = OCOMP(request_id, debug, product=product, profile=profile) self.preload() - self.tag = 'Created by Open Command Platform - OCOMP' + self.tag = 'Powered by Open Command Platform - OCOMP' def preload(self): if self.conf['ONAP']: @@ -173,7 +173,7 @@ class ONAP: 'vlm-version': self.vlm_version, 'vlm-key-group-id': self.key_group_id, 'vlm-entitle-pool-id': self.entitlement_id, - 'part-number': 'OCOMP'}) + 'part-number': '100000'}) self.feature_group_id = output['id'] submit = True @@ -211,15 +211,22 @@ class ONAP: params={'vsp-id': self.vsp_id, 'vsp-version': self.vsp_version_id, 'vsp-file': self.conf['vnf']['vsp-csar']}) + output = self.ocomp.run(command='vsp-validate', params={'vsp-id': self.vsp_id, 'vsp-version': self.vsp_version_id}) if not output['status'] == "Success": raise Exception("Invalid VSP package, please check it compliance using VTP") + self.ocomp.run(command='vsp-commit', + params={'vsp-id': self.vsp_id, + 'vsp-version': self.vsp_version_id, + 'remarks': self.tag}) + self.ocomp.run(command='vsp-submit', params={'vsp-id': self.vsp_id, 'vsp-version': self.vsp_version_id}) + self.ocomp.run(command='vsp-package', params={'vsp-id': self.vsp_id, 'vsp-version': self.vsp_version_id}) @@ -313,7 +320,7 @@ class ONAP: def setup_cloud_and_subscription(self): associate = False if not self.location_id and not self.location_version: - location_id = 'ocomp-region' + location_id = 'ocomp-region-{}'.format(self.ocomp.request_id) self.ocomp.run(command='complex-create', params={'physical-location-id': location_id, 'data-center-code': 'ocomp', @@ -342,7 +349,7 @@ class ONAP: break if not self.cloud_id and not self.cloud_version: - cloud_id = 'OCOMP' + cloud_id = 'OCOMP-{}'.format(self.ocomp.request_id) self.ocomp.run(command='cloud-create', params={'region-name': self.conf['cloud']['region'], 'complex-name': self.location_id, @@ -379,10 +386,11 @@ class ONAP: subscribe = False if not self.service_type_id and not self.service_type_version: + service_type_id = '{}-{}'.format(self.conf['subscription']['service-type'], self.ocomp.request_id) self.ocomp.run(command='service-type-create', - params={'service-type': self.conf['subscription']['service-type'], - 'service-type-id': self.conf['subscription']['service-type']}) - self.service_type_id = self.conf['subscription']['service-type'] + params={'service-type': service_type_id, + 'service-type-id': service_type_id}) + self.service_type_id = service_type_id subscribe = True output = self.ocomp.run(command='service-type-list') @@ -393,10 +401,11 @@ class ONAP: break if not self.customer_id and not self.customer_version: + customer_id = '{}-{}'.format(self.conf['subscription']['customer-name'], self.ocomp.request_id) self.ocomp.run(command='customer-create', - params={'customer-name': self.conf['subscription']['customer-name'], - 'subscriber-name': self.conf['subscription']['customer-name']}) - self.customer_id = self.conf['subscription']['customer-name'] + params={'customer-name': customer_id, + 'subscriber-name': customer_id}) + self.customer_id = customer_id subscribe = True output = self.ocomp.run(command='customer-list') @@ -619,8 +628,9 @@ if __name__ == '__main__': '\ncleanup - Remove the ONAP objects which are either created during \nsetup and standup phase or provided by the user in result-json file ' \ '\nCAUTION: If required, do not provide the existing ONAP object ids \nin result-json while doing the cleanup, to avoid them getting deleted.'\ '\ncheckup - Check the deployment weather OCOMP is working properly or not' \ + '\nprovision - Run thru setup -> standup' \ '\nvalidate - run thru setup -> standup -> cleanup modes for end to end vnf validation', - choices=('setup', 'standup', 'cleanup', 'checkup', 'validate')) + choices=('setup', 'standup', 'cleanup', 'checkup', 'provision', 'validate')) args = parser.parse_args() print (args) @@ -636,6 +646,8 @@ if __name__ == '__main__': profile = args.profile request_id = args.request_id + if not request_id: + request_id = str(uuid.uuid4()) vsp_csar = args.vsp vnf_csar = args.vnf_csar ns_csar = args.ns_csar @@ -671,8 +683,10 @@ if __name__ == '__main__': conf['vnf']['ns-csar'] = vnf_csar if vnf_name: conf['vnf']['name'] = vnf_name + conf['vnf']['name'] = '{}{}'.format(conf['vnf']['name'], request_id) if vnf_name: conf['vnf']['vendor-name'] = vendor_name + conf['vnf']['vendor-name'] = '{}-{}'.format(conf['vnf']['vendor-name'], request_id) if args.result: @@ -713,6 +727,9 @@ if __name__ == '__main__': elif mode == 'checkup': onap.ocomp.product = 'open-cli' onap.ocomp.run(command='schema-list', params={'product': 'open-cli'}) + elif mode == 'provision': + _setup() + _standup() elif mode == 'validate': _setup() _standup() diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-commit-schema-dublin-moco.json b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-commit-schema-dublin-moco.json new file mode 100644 index 00000000..439f5e00 --- /dev/null +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-commit-schema-dublin-moco.json @@ -0,0 +1,24 @@ +[ {
+ "request" : {
+ "method" : "put",
+ "uri" : "/onboarding-api/v1.0/items/a653d9bd40dc43e2ae45004daeab9003/versions/d6e590f98c2347b7a29b27e263527fac/actions",
+ "headers" : {
+ "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "USER_ID" : "cs0008",
+ "X-TransactionId" : "req-f64dec4f-646e-46d8-807e-99e7170a6afb",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "action" : "Commit",
+ "commitRequest" : {
+ "message" : "Powered by Open Command Platform - OCOMP"
+ }
+ }
+ },
+ "response" : {
+ "status" : 200,
+ "json" : { }
+ }
+} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-commit-schema-dublin-sample.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-commit-schema-dublin-sample.yaml new file mode 100644 index 00000000..3f02163a --- /dev/null +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-commit-schema-dublin-sample.yaml @@ -0,0 +1,10 @@ +open_cli_sample_version: 1.0 +name: vsp-commit +version: onap-dublin +samples: + sample1: + name: vsp-commit + input: --format json --remarks Powered by Open Command Platform - OCOMP --vsp-version d6e590f98c2347b7a29b27e263527fac --vsp-id a653d9bd40dc43e2ae45004daeab9003 + moco: vsp-commit-schema-dublin-moco.json + output: | + [{}] diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-commit-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-commit-schema-dublin.yaml new file mode 100644 index 00000000..4bc103da --- /dev/null +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-commit-schema-dublin.yaml @@ -0,0 +1,56 @@ +# Copyright 2019 Huawei Technologies Co., Ltd. +# +# 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: vsp-commit +description: Commit Vendor Software Product + +info: + product: onap-dublin + service: sdc.onboarding + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: vsp-id + description: Onap VSP ID + type: string + short_option: x + long_option: vsp-id + is_optional: false + - name: vsp-version + description: VSP version + type: string + short_option: y + long_option: vsp-version + is_optional: false + - name: remarks + description: VSP remarks + type: string + short_option: z + long_option: remarks + is_optional: true + default_value: Created by OCOMP +http: + service: + name: sdc + version: v1.0 + auth: basic + mode: direct + request: + uri: /onboarding-api/v1.0/items/${vsp-id}/versions/${vsp-version}/actions + method: PUT + body: '{"action":"Commit","commitRequest":{"message":"${remarks}"}}' + success_codes: + - 201 + - 200 diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema-dublin.yaml index 041f536d..16dc068b 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema-dublin.yaml @@ -100,7 +100,7 @@ http: body: '{ "category": "resourceNewCategory.generic", "vendorId": "${vlm-id}", - "subCategory": "resourceNewCategory.generic.abstract", + "subCategory": "resourceNewCategory.generic.network elements", "description": "${vsp-description}", "licensingVersion": "${vlm-version}", "licensingData": {"featureGroups": ["${vlm-feature-group-id}"], "licenseAgreement": "${vlm-agreement-id}"}, 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 9b59a71b..29fceccd 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 @@ -13,7 +13,7 @@ # limitations under the License. open_cli_schema_version: 1.0 -name: vfc-nslcm-create1 +name: vfc-nslcm-create description: vfc nslcm create ns info: |