aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaibin Huang <haibin.huang@intel.com>2019-05-14 21:13:18 +0800
committerHaibin Huang <haibin.huang@intel.com>2019-05-21 11:19:56 +0800
commit3579f7ed991c08d0ba81f3782bde41c02f855131 (patch)
treecb86e6d43814b1a752926f0675ee6ff7ef69fcb3
parentb6a27e640cba472d090090e990fae8856a6871f3 (diff)
Add upload location file to catalog
Change-Id: Ie3965d128c21f5329b2a3be9ad14bb0d0978e4f0 Issue-ID: CLI-149 Signed-off-by: Haibin Huang <haibin.huang@intel.com>
-rw-r--r--products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-create-ns-schema.yaml70
-rw-r--r--products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-create-vnf-schema.yaml69
-rw-r--r--products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-get-ns-schema.yaml42
-rw-r--r--products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-get-vnf-schema.yaml41
-rw-r--r--products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-instantiate-schema.yaml17
5 files changed, 161 insertions, 78 deletions
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-create-ns-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-create-ns-schema.yaml
new file mode 100644
index 00000000..863fd358
--- /dev/null
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-create-ns-schema.yaml
@@ -0,0 +1,70 @@
+# 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-create-ns
+description: vfc create ns
+
+info:
+ product: onap-dublin
+ service: vfc
+ author: ONAP HPA Integration Team (haibin.huang@intel.com)
+
+parameters:
+ - name: user-key
+ description: user defined data key eg:"key1"
+ type: string
+ short_option: c
+ long_option: user-key
+ is_optional: false
+ - name: user-value
+ description: user defined data value eg:"value1"
+ type: string
+ short_option: e
+ long_option: user-value
+ is_optional: false
+
+
+results:
+ direction: landscape
+ attributes:
+ - name: id
+ description: id
+ scope: short
+ type: string
+ - name: state
+ description: state
+ scope: short
+ type: string
+
+http:
+ service:
+ auth: none
+ mode: direct
+ request:
+ uri: /api/nsd/v1/ns_descriptors
+ method: POST
+ context:
+ remove_empty_node: true
+ body: '{
+ "userDefinedData": {"${user-key}": "${user-value}"}
+ }'
+ headers:
+ Content-Type: application/json
+ Accept: application/json
+ success_codes:
+ - 201
+ result_map:
+ id: $b{$.id}
+ state: $b{$.nsdOnboardingState}
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-create-vnf-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-create-vnf-schema.yaml
new file mode 100644
index 00000000..df22019b
--- /dev/null
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-create-vnf-schema.yaml
@@ -0,0 +1,69 @@
+# 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-create-vnf
+description: vfc create vnf
+
+info:
+ product: onap-dublin
+ service: vfc
+ author: ONAP HPA Integration Team (haibin.huang@intel.com)
+
+parameters:
+ - name: user-key
+ description: user defined data key eg:"key2"
+ type: string
+ short_option: c
+ long_option: user-key
+ is_optional: false
+ - name: user-value
+ description: user defined data value eg:"value2"
+ type: string
+ short_option: e
+ long_option: user-value
+ is_optional: false
+
+results:
+ direction: landscape
+ attributes:
+ - name: id
+ description: id
+ scope: short
+ type: string
+ - name: state
+ description: state
+ scope: short
+ type: string
+
+http:
+ service:
+ auth: none
+ mode: direct
+ request:
+ uri: /api/vnfpkgm/v1/vnf_packages
+ method: POST
+ context:
+ remove_empty_node: true
+ body: '{
+ "userDefinedData": {"${user-key}": "${user-value}"}
+ }'
+ headers:
+ Content-Type: application/json
+ Accept: application/json
+ success_codes:
+ - 201
+ result_map:
+ id: $b{$.id}
+ state: $b{$.onboardingState}
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
index 71737261..ff672859 100644
--- 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
@@ -21,39 +21,15 @@ info:
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
+ - name: csar-id
+ description: csar-id
scope: short
type: string
- - name: download-url
- description: download-url
- scope: long
- type: string
- - name: csar-name
- description: csar-name
+ - name: package-info
+ description: package-info
scope: short
type: string
@@ -62,7 +38,7 @@ http:
auth: none
mode: direct
request:
- uri: /api/catalog/v1/nspackages/${ns-csar-uuid}
+ uri: /api/catalog/v1/nspackages
method: GET
context:
remove_empty_node: true
@@ -73,9 +49,5 @@ http:
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}
+ csar-id: $b{$.[*].csarId}
+ package-info: $b{$.[*].packageInfo}
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
index 2727b52f..8f2c05f1 100644
--- 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
@@ -21,39 +21,11 @@ info:
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
+ - name: csar-id
+ description: csar-id
scope: short
type: string
@@ -62,7 +34,7 @@ http:
auth: none
mode: direct
request:
- uri: /api/catalog/v1/vnfpackages/${vnf-csar-uuid}
+ uri: /api/catalog/v1/vnfpackages
method: GET
context:
remove_empty_node: true
@@ -73,9 +45,4 @@ http:
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}
+ csar-id: $b{$.[*].csarId}
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-instantiate-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-instantiate-schema.yaml
index 5db338f7..b31d4e4f 100644
--- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-instantiate-schema.yaml
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-instantiate-schema.yaml
@@ -28,11 +28,11 @@ parameters:
short_option: i
long_option: ns-instance-id
is_optional: false
- - name: location-constraints
- description: localtion constraints
- type: json
+ - name: location
+ description: localtion(vimid)
+ type: string
short_option: c
- long_option: location-constraints
+ long_option: location
is_optional: false
- name: sdn-controller-id
description: sdn controller id
@@ -58,8 +58,13 @@ http:
method: POST
context:
remove_empty_node: true
- body: '{"additionalParamForNs": {"sdnControllerId": "${sdn-controller-id}"},
- "locationConstraints": "${location-constraints}"}'
+ body: '{
+ "additionalParamForNs":
+ {
+ "sdncontroller": "${sdn-controller-id}",
+ "location": "${location}"
+ }
+ }'
headers:
Content-Type: application/json
Accept: application/json