Merge changes If9f3b812,I19422f65

* changes:
  Add Itohan as committer
  Remove invalid cmd YAML

3 files changed, 5 insertions, 338 deletions

diff --git a/INFO.yaml b/INFO.yaml
index fb8644a1..53f23172 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -41,5 +41,10 @@ committers:
       company: 'ATT'
       id: 'talasila'
       timezone: 'America/New York'
+    - name: 'Itohan Ukponmwan'
+      email: 'itohan.ukponmwan@intel.com'
+      company: 'Intel'
+      id: 'itohan'
+      timezone: 'America/Pacific'
 tsc:
     approval: 'https://lists.onap.org/pipermail/onap-tsc'
diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-create-vcpe-schema-dublin.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-create-vcpe-schema-dublin.yaml
deleted file mode 100644
index 1294e7c2..00000000
--- a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-create-vcpe-schema-dublin.yaml
+++ /dev/null
@@ -1,247 +0,0 @@
-# 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: service-create-vcpe

-description: Create a vcpe service instance using SO

-

-info:

-  product: onap-dublin

-  service: so

-  author: ONAP CLI Team onap-discuss@lists.onap.org

-

-parameters:

-- name: cloud-region

-  description: cloud region identifier

-  type: string

-  short_option: l

-  long_option: cloud-region

-  is_optional: true

-- name: tenant-id

-  description: tenant id

-  type: string

-  short_option: t

-  long_option: tenant-id

-  is_optional: true

-- name: model-invariant-id

-  description: model invariant id generated by ASDC.

-  type: string

-  short_option: e

-  long_option: model-invariant-id

-  is_optional: false

-- name: model-uuid

-  description: model uuid generated by ASDC.

-  type: string

-  short_option: g

-  long_option: model-uuid

-  is_optional: false

-- name: model-name

-  description: model name as provided in ASDC design time.

-  type: string

-  short_option: i

-  long_option: model-name

-  is_optional: false

-- name: model-version

-  description: model-version

-  type: string

-  short_option: j

-  long_option: model-version

-  is_optional: false

-- name: model-version-id

-  description: model-version-id

-  type: string

-  short_option: n

-  long_option: model-version-id

-  is_optional: false

-- name: customer

-  description: unique id for customer

-  type: string

-  short_option: c

-  long_option: customer

-  is_optional: false

-- name: requestor-id

-  description: requestor ID

-  type: string

-  short_option: q

-  long_option: requestor-id

-  is_optional: false

-- name: instance-name

-  description: service instance name

-  type: string

-  short_option: k

-  long_option: instance-name

-  is_optional: false

-- name: supress-rollback

-  description: rollback changes if instantiation fails.

-  type: bool

-  short_option: r

-  long_option: supress-rollback

-  is_optional: true

-- name: brg-wan-mac-address

-  description: BRG_WAN_MAC_Address

-  type: string

-  short_option: b

-  long_option: brg-wan-mac-address

-  is_optional: false

-- name: customer-latitude

-  description: customer latitude, part of customer location

-  type: string

-  short_option: f

-  long_option: customer-latitude

-  is_optional: true

-- name: customer-longitude

-  description: customer longitude, part of customer location

-  type: string

-  short_option: d

-  long_option: customer-longitude

-  is_optional: true

-- name: customer-name

-  description: customer name, part of customer location

-  type: string

-  short_option: y

-  long_option: customer-name

-  is_optional: true

-- name: homing-solution

-  description: homing solution to use [oof|sniro]

-  type: string

-  short_option: h

-  long_option: homing-solution

-  is_optional: true

-- name: orchestrator

-  description: orchestrator to use [multicloud|openstack(default)]

-  type: string

-  short_option: o

-  long_option: orchestrator

-  is_optional: true

-- name: api

-  description: api to use [GR_API|VNF_API]

-  type: string

-  short_option: p

-  long_option: api

-  is_optional: true

-  default_value: VNF_API

-- name: subscriber-name

-  description: subscriber name

-  type: string

-  short_option: s

-  long_option: subscriber-name

-  is_optional: true

-- name: project-name

-  description: project name

-  type: string

-  short_option: x

-  long_option: project-name

-  is_optional: true

-- name: owning-entity-id

-  description: owning entity id

-  type: string

-  short_option: z

-  long_option: owning-entity-id

-  is_optional: true

-- name: owning-entity-name

-  description: owning entity name

-  type: string

-  short_option: m

-  long_option: owning-entity-name

-  is_optional: true

-

-results:

-  direction: portrait

-  attributes:

-  - name: service-id

-    description: instance id for the created service.

-    type: string

-    scope: short

-

-

-http:

-  service:

-    name: so

-    version: v6

-    auth: basic

-    mode: direct

-  request:

-    uri: /onap/so/infra/serviceInstances/v6

-    method: POST

-    body: '{

-              "requestDetails":{

-                 "cloudConfiguration":{

-                    "lcpCloudRegionId":"${cloud-region}",

-                    "tenantId":"${tenant-id}"

-                 },

-                 "modelInfo":{

-                    "modelType":"service",

-                    "modelInvariantId":"${model-invariant-id}",

-                    "modelNameVersionId":"${model-uuid}",

-                    "modelName":"${model-name}",

-                    "modelVersion":"${model-version}",

-                    "modelVersionId":"${model-version-id}"

-                 },

-                 "subscriberInfo":{

-                    "globalSubscriberId":"${customer}",

-                    "subscriberName":"${subscriber-name}"

-                 },

-                 "requestInfo":{

-                    "requestorId":"${requestor-id}",

-                    "instanceName":"${instance-name}",

-                    "source":"CLI",

-                    "suppressRollback":"${supress-rollback}"

-                 },

-                 "requestParameters":{

-                    "subscriptionServiceType":"vCPE",

-                    "aLaCarte":"false",

-                    "testApi":"${api}",

-                    "userParams":[

-                       {

-                          "name":"BRG_WAN_MAC_Address",

-                          "value":"${brg-wan-mac-address}"

-                       },

-                       {

-                          "name":"Customer_Location",

-                          "value":{

-                             "customerLatitude":"${customer-latitude}",

-                             "customerLongitude":"${customer-longitude}",

-                             "customerName":"${customer-name}"

-                          }

-                       },

-                       {

-                          "name":"Homing_Solution",

-                          "value":"${homing-solution}"

-                       },

-                       {

-                          "name":"orchestrator",

-                          "value":"${orchestrator}"

-                       }

-                    ]

-                 },

-                 "project":{

-                    "projectName":"${project-name}"

-                 },

-                 "owningEntity":{

-                    "owningEntityId":"${owning-entity-id}",

-                    "owningEntityName":"${owning-entity-name}"

-                 }

-              }

-           }'

-  success_codes:

-  - 202

-  result_map:

-    service-id: $b{$.requestReferences.instanceId}

-  sample_response:

-    body: '{

-              "requestReferences":{

-                 "instanceId":"${instance-id}",

-                 "requestId":"375ba428-65e7-4f2b-afb9-74735ac6bfd0"

-              }

-           }'

diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-show-schema-dublin.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-show-schema-dublin.yaml
deleted file mode 100644
index 184707e8..00000000
--- a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-show-schema-dublin.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-#  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: service-show

-description: Show a service instances from SO

-

-info:

-  product: onap-dublin

-  service: so

-  author: ONAP CLI Team onap-discuss@lists.onap.org

-

-parameters:

-- name: service-id

-  description: unique id for service instance

-  type: string

-  short_option: s

-  long_option: service-instace-id

-  is_optional: false

-

-results:

-  direction: landscape

-  attributes:

-  - name: name

-    description: Onap service name

-    scope: short

-    type: string

-  - name: version

-    description: Onap service version

-    scope: short

-    type: string

-  - name: url

-    description: Onap service base url

-    scope: short

-    type: url

-  - name: status

-    description: Onap service status

-    scope: short

-    type: digit

-  - name: nodes

-    description: Onap service running nodes

-    scope: long

-    type: json

-  - name: enable-ssl

-    description: Onap service is enabled with https or not

-    scope: long

-    type: string

-  - name: path

-    description: Onap service path

-    scope: long

-    type: string

-

-

-http:

-  service:

-    name: so

-    version: v6

-    auth: basic

-    mode: direct

-  request:

-    uri: /onap/so/infra/serviceInstances/v6/${service-id}

-    method: GET

-  success_codes:

-  - 201

-  - 200

-  result_map:

-    name: $b{$.[*].serviceName}

-    version: $b{$.[*].version}

-    url: $b{$.[*].url}

-    status: $b{$.[*].status}

-    enable-ssl: $b{$.[*].enable_ssl}

-    path: $b{$.[*].path}

-    nodes: $b{$.[*].nodes[*].ip}:$b{$.[*].nodes[*].port}

-  sample_response:

-    body: '{

-              "requestReferences":{

-                 "instanceId":"${instance-id}",

-                 "requestId":"375ba428-65e7-4f2b-afb9-74735ac6bfd0"

-              }

-           }'