aboutsummaryrefslogtreecommitdiffstats
path: root/products/onap-elalto/features/aai
diff options
context:
space:
mode:
authorKanagaraj Manickam <kanagaraj.manickam@huawei.com>2019-09-13 06:44:49 +0000
committerGerrit Code Review <gerrit@onap.org>2019-09-13 06:44:49 +0000
commit713681d51da5acd78f37ce647e9b44b1fb8d2c5c (patch)
tree49b03d5d2643ebabad8dd328a28b1e1df781138f /products/onap-elalto/features/aai
parentc1c644d51059d03785cd341684152bae29f1cd27 (diff)
parent972f3d52ba96f1b4a2630fdea963855550feb565 (diff)
Merge "Added feature commands not added from dublin"
Diffstat (limited to 'products/onap-elalto/features/aai')
-rw-r--r--products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/subscription/subscription-create-schema-elalto.yaml2
-rw-r--r--products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-create-schema-elalto.yaml26
-rw-r--r--products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-associate-schema-elalto.yaml2
-rw-r--r--products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-create-schema-elalto.yaml2
-rw-r--r--products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-delete-schema-elalto.yaml2
-rw-r--r--products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-list-schema-elalto.yaml2
-rw-r--r--products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-update-schema-elalto.yaml2
7 files changed, 16 insertions, 22 deletions
diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/subscription/subscription-create-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/subscription/subscription-create-schema-elalto.yaml
index a63ddd22..4b80546d 100644
--- a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/subscription/subscription-create-schema-elalto.yaml
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/subscription/subscription-create-schema-elalto.yaml
@@ -75,7 +75,7 @@ http:
{
"related-to": "tenant",
"relationship-label": "org.onap.relationships.inventory.Uses",
- "related-link": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/${cloud-owner}/${cloud-region}/tenants/tenant/${cloud-tenant-id}",
+ "related-link": "/aai/v16/cloud-infrastructure/cloud-regions/cloud-region/${cloud-owner}/${cloud-region}/tenants/tenant/${cloud-tenant-id}",
"relationship-data": [
{
"relationship-key": "cloud-region.cloud-owner",
diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-create-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-create-schema-elalto.yaml
index f834554d..00c9712e 100644
--- a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-create-schema-elalto.yaml
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-create-schema-elalto.yaml
@@ -1,4 +1,4 @@
-# Copyright 2019 Huawei Technologies Co., Ltd.
+# 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.
@@ -41,7 +41,7 @@ parameters:
short_option: q
long_option: cloud-type
is_optional: false
- - name: owner-defined-type
+ - name: owner-type
description: owner defined type
type: string
short_option: r
@@ -77,14 +77,14 @@ parameters:
short_option: S
long_option: sriov-automation
is_optional: true
- default: false
+ default_value: false
- name: identity-url
description: Onap identity-url, updated by multicloud if multicloud is used
type: string
short_option: i
long_option: identity-url
is_optional: false
- - name: esr-system-info-id
+ - name: esr-id
description: id for esr system (arbitrary UUID e.g 5c85ce1f-aa78-4ebf-8d6f-4b62773e9bc8)
type: uuid
short_option: e
@@ -96,11 +96,11 @@ parameters:
short_option: url
long_option: service-url
is_optional: false
- - name: user-name
+ - name: username
description: cloud user name
type: string
short_option: b
- long_option: user-name
+ long_option: username
is_optional: false
- name: password
description: cloud password
@@ -138,12 +138,6 @@ parameters:
short_option: k
long_option: system-status
is_optional: false
- - name: cloud-extra-info
- description: extra info to register cloud , generally string with region id e.g {\"openstack-region-id\":\"region-id\"}, enter as {\\"openstack-region-id\\":\\"ONAP-POD-01-Rail-07\\"} with CLI
- type: string
- short_option: I
- long_option: extra-info
- is_optional: false
http:
service:
@@ -156,19 +150,19 @@ http:
"cloud-owner": "${cloud-owner}",
"cloud-region-id": "${region-name}",
"cloud-type": "${cloud-type}",
- "owner-defined-type": "${owner-defined-type}",
+ "owner-defined-type": "${owner-type}",
"cloud-region-version": "${cloud-region-version}",
"complex-name":"${complex-name}",
"cloud-zone": "${cloud-zone}",
"sriov-automation": "${sriov-automation}",
"identity-url": "${identity-url}",
- "cloud-extra-info":"${cloud-extra-info}",
+ "cloud-extra-info":"{\"openstack-region-id\":\"${region-name}\"}",
"esr-system-info-list": {
"esr-system-info":[
{
- "esr-system-info-id":"${esr-system-info-id}",
+ "esr-system-info-id":"${esr-id}",
"service-url": "${service-url}",
- "user-name":"${user-name}",
+ "user-name":"${username}",
"password":"${password}",
"system-type": "${system-type}",
"ssl-insecure": "${ssl-insecure}",
diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-associate-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-associate-schema-elalto.yaml
index ae87a622..7e168a8c 100644
--- a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-associate-schema-elalto.yaml
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-associate-schema-elalto.yaml
@@ -19,7 +19,7 @@ description: Associate a cloud region with a cloud complex
info:
product: onap-elalto
service: aai
- author: Intel ONAP HPA integration team (itohan.ukponmwan@intel.com)
+ author: Intel ONAP HPA integration team (onap-discuss@lists.onap.org)
parameters:
- name: complex-name
diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-create-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-create-schema-elalto.yaml
index 0d5bf3cc..cc4355eb 100644
--- a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-create-schema-elalto.yaml
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-create-schema-elalto.yaml
@@ -19,7 +19,7 @@ description: Create a cloud complex in Onap
info:
product: onap-elalto
service: aai
- author: Intel ONAP HPA integration team (itohan.ukponmwan@intel.com)
+ author: Intel ONAP HPA integration team (onap-discuss@lists.onap.org)
parameters:
- name: physical-location-id
diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-delete-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-delete-schema-elalto.yaml
index 8c1b4126..80f374fe 100644
--- a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-delete-schema-elalto.yaml
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-delete-schema-elalto.yaml
@@ -19,7 +19,7 @@ description: Delete a complex from Onap
info:
product: onap-elalto
service: aai
- author: ONAP HPA Integration Team (itohan.ukponmwan@intel.com)
+ author: ONAP HPA Integration Team (onap-discuss@lists.onap.org)
parameters:
- name: complex-name
diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-list-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-list-schema-elalto.yaml
index 66b1754d..aaad4ec2 100644
--- a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-list-schema-elalto.yaml
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-list-schema-elalto.yaml
@@ -19,7 +19,7 @@ description: List the configured complexes
info:
product: onap-elalto
service: aai
- author: ONAP HPA Integration Team (itohan.ukponmwan@intel.com)
+ author: ONAP HPA Integration Team (onap-discuss@lists.onap.org)
results:
direction: landscape
diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-update-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-update-schema-elalto.yaml
index 605d2992..96ca6c8c 100644
--- a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-update-schema-elalto.yaml
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-update-schema-elalto.yaml
@@ -19,7 +19,7 @@ description: Update a cloud complex in Onap
info:
product: onap-elalto
service: aai
- author: Intel ONAP HPA integration team (itohan.ukponmwan@intel.com)
+ author: Intel ONAP HPA integration team (onap-discuss@lists.onap.org)
parameters:
- name: physical-location-id