From 43c35ac4fb25e2e214043c72888aff5f7de18f33 Mon Sep 17 00:00:00 2001 From: Kanagaraj M Date: Tue, 3 Sep 2019 17:03:07 +0530 Subject: Add VSP Commit as part of on-boarding Issue-ID: CLI-166 Change-Id: If344e27e2a4b00f03fe9ef4472664f8a52259b1c Signed-off-by: Kanagaraj Manickam k00365106 --- .../src/main/resources/conf/vnf-tosca-provision.json | 10 +++++----- .../src/main/resources/script/vnf-tosca-provision.py | 11 +++++++++-- 2 files changed, 14 insertions(+), 7 deletions(-) (limited to 'products/onap-dublin') 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..fcb36bb7 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" : "vnfvendor0309190443", + "name": "vgwvnfovpdemo0309190443", + "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/script/vnf-tosca-provision.py b/products/onap-dublin/features/integration/src/main/resources/script/vnf-tosca-provision.py index 40f00a77..a9bbe188 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}) -- cgit 1.2.3-korg