Fix the moco json reference name

Issue-ID: CLI-100

Change-Id: I839941526c75f6edab89e0294bc9714f83d4cede
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

68 files changed, 68 insertions, 68 deletions

diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/cloud-region/cloud-create-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/cloud-region/cloud-create-schema-beijing-sample.yaml
index 16b1edec..acb2262c 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/cloud-region/cloud-create-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/cloud-region/cloud-create-schema-beijing-sample.yaml
@@ -19,6 +19,6 @@ samples:
   sample1:
     name: cloud-create
     input: --cloud-name huawei-cloud --region-name bangalore
-    moco: cloud-create-schema-1.1-moco.json
+    moco: cloud-create-schema-beijing-moco.json
     output: |
 
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/cloud-region/cloud-delete-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/cloud-region/cloud-delete-schema-beijing-sample.yaml
index 92c21b24..b4f4ff23 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/cloud-region/cloud-delete-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/cloud-region/cloud-delete-schema-beijing-sample.yaml
@@ -19,6 +19,6 @@ samples:
   sample1:
     name: cloud-delete
     input: --cloud-name huawei-cloud-test --region-name bangalore-test --resource-version 1509027982352
-    moco: cloud-delete-schema-1.1-moco.json
+    moco: cloud-delete-schema-beijing-moco.json
     output: |
 
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/cloud-region/cloud-list-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/cloud-region/cloud-list-schema-beijing-sample.yaml
index 57aa752c..f84e2088 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/cloud-region/cloud-list-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/cloud-region/cloud-list-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: cloud-list
     input:
-    moco: cloud-list-schema-1.1-moco.json
+    moco: cloud-list-schema-beijing-moco.json
     output: |
       +--------------+------------+------------------+
       |cloud         |region      |resource-version  |
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/customer/customer-create-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/customer/customer-create-schema-beijing-sample.yaml
index 0272dc27..99c435d0 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/customer/customer-create-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/customer/customer-create-schema-beijing-sample.yaml
@@ -19,6 +19,6 @@ samples:
   sample1:
     name: customer-create
     input: --customer-name test --subscriber-name test
-    moco: customer-create-schema-1.1-moco.json
+    moco: customer-create-schema-beijing-moco.json
     output: |
 
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/customer/customer-delete-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/customer/customer-delete-schema-beijing-sample.yaml
index 9f8331c5..67299d6d 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/customer/customer-delete-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/customer/customer-delete-schema-beijing-sample.yaml
@@ -19,6 +19,6 @@ samples:
   sample1:
     name: customer-delete
     input: --customer-name test --resource-version 1509029022293
-    moco: customer-delete-schema-1.1-moco.json
+    moco: customer-delete-schema-beijing-moco.json
     output: |
 
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/customer/customer-list-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/customer/customer-list-schema-beijing-sample.yaml
index f76ed220..7c9f8345 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/customer/customer-list-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/customer/customer-list-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: customer-list
     input:
-    moco: customer-list-schema-1.1-moco.json
+    moco: customer-list-schema-beijing-moco.json
     output: |
       +----------------+------------------+
       |name            |resource-version  |
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/customer/customer-show-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/customer/customer-show-schema-beijing-sample.yaml
index 942b81b5..1aea2fed 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/customer/customer-show-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/customer/customer-show-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: customer-show
     input: --customer-name kanag --long
-    moco: customer-show-schema-1.1-moco.json
+    moco: customer-show-schema-beijing-moco.json
     output: |
       +--------+------------------+------------------+------------------+
       |name    |subscriber-name   |resource-version  |subscriber-type   |
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-create-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-create-schema-beijing-sample.yaml
index 9c7735b0..d7665edc 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-create-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-create-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: ems-register
     input: --name ems1 --type ems --vendor boco --ems-version 1.0 --url http://10.0.0.1 --username admin --password password --remote-path sample
-    moco: ems-create-schema-1.1-moco.json
+    moco: ems-create-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-delete-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-delete-schema-beijing-sample.yaml
index d5d7798a..ce0ad6e3 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-delete-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-delete-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: ems-unregister
     input: --ems-id 51a480ed-649c-4c47-a84b-f966dc4f9554 --resource-version 1509095358658
-    moco: ems-delete-schema-1.1-moco.json
+    moco: ems-delete-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-list-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-list-schema-beijing-sample.yaml
index 64d98541..29584775 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-list-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-list-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: ems-list
     input:
-    moco: ems-list-schema-1.1-moco.json
+    moco: ems-list-schema-beijing-moco.json
     output: |
       +--------------------------------------+------------------+
       |ems-id                                |resource-version  |
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-show-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-show-schema-beijing-sample.yaml
index a5e40aa2..dcd0eba9 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-show-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-show-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: ems-show
     input: --ems-id 51a480ed-649c-4c47-a84b-f966dc4f9554
-    moco: ems-show-schema-1.1-moco.json
+    moco: ems-show-schema-beijing-moco.json
     output: |
       +------+------+--------+----------+------------------+
       |name  |type  |vendor  |version   |url               |
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-create-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-create-schema-beijing-sample.yaml
index a6fac1a8..37f2f1b4 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-create-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-create-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: vim-register
     input: --cloud-name huawei-cloud --region-name bangalore --name vim1 --type OpenStack --vendor Devstack --vim-version newton --url http://192.168.16.149/identity --username onap --password onap --cloud-domain default --default-tenant onap
-    moco: vim-create-schema-1.1-moco.json
+    moco: vim-create-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-delete-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-delete-schema-beijing-sample.yaml
index a490aa2e..3d6dcfec 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-delete-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-delete-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: vim-unregister
     input: --vim-id 810edb5a-42e9-462d-9587-96bc9272ac27 --cloud-name huawei-cloud --region-name bangalore --resource-version 1509093590932
-    moco: vim-delete-schema-1.1-moco.json
+    moco: vim-delete-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-list-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-list-schema-beijing-sample.yaml
index e515bd0d..2f5ac402 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-list-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-list-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vim-list
     input: --cloud-name huawei-cloud --region-name bangalore --long
-    moco: vim-list-schema-1.1-moco.json
+    moco: vim-list-schema-beijing-moco.json
     output: |
       +--------------------------------------+------------+------------+----------+----------+--------------------------------+----------+--------------+----------------+------------------+
       |vim-id                                |name        |type        |vendor    |version   |url                             |username  |cloud-domain  |default-tenant  |resource-version  |
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-beijing-sample.yaml
index d65e3e3e..055a79c3 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: vnfm-register
     input: --vim-id acc5e14e-1320-4ab5-97fe-b7cc82ad03f2 --name vnfm1 --type OpenStack --vendor ONAP --vnfm-version 1.0 --url http://10.0.1.1 --username admin --password password
-    moco: vnfm-create-schema-1.1-moco.json
+    moco: vnfm-create-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-beijing-sample.yaml
index dfac1b89..0204ffa5 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: vnfm-unregister
     input: --vnfm-id c0ecd788-22f4-49a4-a969-68051cd517e7 --resource-version 1509094328901
-    moco: vnfm-delete-schema-1.1-moco.json
+    moco: vnfm-delete-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-beijing-sample.yaml
index 14498dff..b3540501 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vnfm-list
     input:
-    moco: vnfm-list-schema-1.1-moco.json
+    moco: vnfm-list-schema-beijing-moco.json
     output: |
       +--------------------------------------+--------------------------------------+------------------+------------------+
       |vnfm-id                               |vim-id                                |certificate-url   |resource-version  |
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-beijing-sample.yaml
index f9db2d0d..121f9860 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vnfm-show
     input: --vnfm-id c0ecd788-22f4-49a4-a969-68051cd517e7
-    moco: vnfm-show-schema-1.1-moco.json
+    moco: vnfm-show-schema-beijing-moco.json
     output: |
       +----------+------------------+
       |property  |value             |
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-instance/service-list-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-instance/service-list-schema-beijing-sample.yaml
index f792d6b5..628f1802 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-instance/service-list-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-instance/service-list-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: service-list
     input: -x Demonstration -y vLB --long
-    moco: service-list-schema-1.1-moco.json
+    moco: service-list-schema-beijing-moco.json
     output: |
       +--------------------------------------+----------------------------+--------------------------------------+--------------------------------------+--------------+
       |service-id                            |service-name                |model-invariant-id                    |model-uuid                            |description   |
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-instance/vf-list-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-instance/vf-list-schema-beijing-sample.yaml
index 714d781d..158a65bc 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-instance/vf-list-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-instance/vf-list-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vf-list
     input: -x Demonstration -y vLB --service-id 2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee
-    moco: vf-list-schema-1.1-moco.json
+    moco: vf-list-schema-beijing-moco.json
     output: |
       +--------------------------------------+--------------------+
       |vf-id                                 |vf-name             |
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-instance/vf-show-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-instance/vf-show-schema-beijing-sample.yaml
index effcf491..48f4c05f 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-instance/vf-show-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-instance/vf-show-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vf-show
     input: --vf-id 1a667ce8-8b8b-4f59-ba5c-b162ae462fef -m https://192.168.17.111:8443 -u AAI -p AAI
-    moco: vf-show-schema-1.1-moco.json
+    moco: vf-show-schema-beijing-moco.json
     output: |
       +------------------------+--------------------------------------+
       |property                |value                                 |
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-type/service-type-create-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-type/service-type-create-schema-beijing-sample.yaml
index 352774d8..3420c408 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-type/service-type-create-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-type/service-type-create-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: service-type-create
     input: --service-type test
-    moco: service-type-create-schema-1.1-moco.json
+    moco: service-type-create-schema-beijing-moco.json
     output:
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-type/service-type-delete-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-type/service-type-delete-schema-beijing-sample.yaml
index e2d457e3..40a9b7eb 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-type/service-type-delete-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-type/service-type-delete-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: service-type-delete
     input: --service-type-id de1fa33f-f676-42e5-b79a-a39825c19b1d --resource-version 1509029708094
-    moco: service-type-delete-schema-1.1-moco.json
+    moco: service-type-delete-schema-beijing-moco.json
     output:
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-type/service-type-list-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-type/service-type-list-schema-beijing-sample.yaml
index 2cc7136d..f12aecdb 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-type/service-type-list-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/service-type/service-type-list-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: service-type-list
     input:
-    moco: service-type-list-schema-1.1-moco.json
+    moco: service-type-list-schema-beijing-moco.json
     output: |
       +--------------------------------------+--------------+------------------+
       |service-type-id                       |service-type  |resource-version  |
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/subscription/subscription-create-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/subscription/subscription-create-schema-beijing-sample.yaml
index 9ee815ab..47a0bb1e 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/subscription/subscription-create-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/subscription/subscription-create-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: subscription-create
     input: --customer-name kanag --cloud-name huawei-cloud --cloud-region bangalore --cloud-tenant-id e18173e6-6a13-4614-a13c-3859e7321103 --service-type vFW-kanag
-    moco: subscription-create-schema-1.1-moco.json
+    moco: subscription-create-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/subscription/subscription-delete-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/subscription/subscription-delete-schema-beijing-sample.yaml
index 56690c26..3ff2436d 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/subscription/subscription-delete-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/subscription/subscription-delete-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: subscription-delete
     input: --customer-name kanag --service-type vFW-kanag --resource-version 1509079144326
-    moco: subscription-delete-schema-1.1-moco.json
+    moco: subscription-delete-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/subscription/subscription-list-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/subscription/subscription-list-schema-beijing-sample.yaml
index 5618bc14..aec64f8c 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/subscription/subscription-list-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-sample/subscription/subscription-list-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: subscription-list
     input: --customer-name kanag
-    moco: subscription-list-schema-1.1-moco.json
+    moco: subscription-list-schema-beijing-moco.json
     output: |
       +--------------+------------------+
       |service-type  |resource-version  |
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-add-vf-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-add-vf-schema-beijing-sample.yaml
index 749acf91..74d683a1 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-add-vf-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-add-vf-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: service-model-add-vf
     input: --service-model-id 7b427dbf-685b-4ba9-8838-a9b3b3c8e584 --vf-id 828be6cf-c11b-4759-ac37-b1b79f86a4b4 --vf-name kanag-cli-VLB --vf-version 1.0 -d
-    moco: service-model-add-vf-schema-1.1-moco.json
+    moco: service-model-add-vf-schema-beijing-moco.json
     output: |
       +----------+----------------------------------------------------+
       |property  |value                                               |
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-certify-complete-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-certify-complete-schema-beijing-sample.yaml
index 4d905e37..f16ae082 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-certify-complete-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-certify-complete-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: service-model-certify-complete
     input: --service-model-id 7b427dbf-685b-4ba9-8838-a9b3b3c8e584
-    moco: service-model-certify-complete-schema-1.1-moco.json
+    moco: service-model-certify-complete-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-certify-request-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-certify-request-schema-beijing-sample.yaml
index 7a285d94..e4877993 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-certify-request-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-certify-request-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: service-model-certify-request
     input: --service-model-id 7b427dbf-685b-4ba9-8838-a9b3b3c8e584
-    moco: service-model-certify-request-schema-1.1-moco.json
+    moco: service-model-certify-request-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-certify-start-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-certify-start-schema-beijing-sample.yaml
index e2c2b423..019462e8 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-certify-start-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-certify-start-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: service-model-certify-start
     input: --service-model-id 7b427dbf-685b-4ba9-8838-a9b3b3c8e584
-    moco: service-model-certify-start-schema-1.1-moco.json
+    moco: service-model-certify-start-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-checkin-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-checkin-schema-beijing-sample.yaml
index c2893973..dc6237da 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-checkin-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-checkin-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: service-model-checkin
     input: --service-model-id 7b427dbf-685b-4ba9-8838-a9b3b3c8e584
-    moco: service-model-checkin-schema-1.1-moco.json
+    moco: service-model-checkin-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-create-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-create-schema-beijing-sample.yaml
index 7ce4d20f..2033b8e0 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-create-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-create-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: service-model-create
     input: --name kanag-cli-VLB --description VLB created from CLI --project-code kanag-123456
-    moco: service-model-create-schema-1.1-moco.json
+    moco: service-model-create-schema-beijing-moco.json
     output: |
       +----------+--------------------------------------+
       |property  |value                                 |
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-distribute-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-distribute-schema-beijing-sample.yaml
index c2957db5..67e9ed14 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-distribute-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-distribute-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: service-model-distribute
     input: --service-model-id 7b427dbf-685b-4ba9-8838-a9b3b3c8e584
-    moco: service-model-distribute-schema-1.1-moco.json
+    moco: service-model-distribute-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-list-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-list-schema-beijing-sample.yaml
index d44e45a7..ac2da0b4 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-list-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-list-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: service-model-list
     input:
-    moco: service-model-list-schema-1.1-moco.json
+    moco: service-model-list-schema-beijing-moco.json
     output: |
       +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+
       |uuid                                  |invariant-uuid                        |name                      |version   |status                  |distribution-status         |
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service2vf-model-list-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service2vf-model-list-schema-beijing-sample.yaml
index 23f2a964..b45feb01 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service2vf-model-list-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/service-model/service2vf-model-list-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: service2vf-model-list
     input: --service-model-id 0f4203a8-a314-47bb-9a7d-28157652cec4
-    moco: service2vf-model-list-schema-1.1-moco.json
+    moco: service2vf-model-list-schema-beijing-moco.json
     output: |
       +--------------------------------------+--------------------------+--------------------------------------+------------+
       |vf-uuid                               |vf-name                   |vf-customization-uuid                 |vf-version  |
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-complete-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-complete-schema-beijing-sample.yaml
index 44b28e70..cdaaa4d3 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-complete-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-complete-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: vf-model-certify-complete
     input: --vf-id 66269482-0b27-40e3-9c4d-6a26fb67d9ff
-    moco: vf-model-certify-complete-schema-1.1-moco.json
+    moco: vf-model-certify-complete-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-request-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-request-schema-beijing-sample.yaml
index faf190c4..e934e411 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-request-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-request-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: vf-model-certify-request
     input: --vf-id 66269482-0b27-40e3-9c4d-6a26fb67d9ff
-    moco: vf-model-certify-request-schema-1.1-moco.json
+    moco: vf-model-certify-request-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-start-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-start-schema-beijing-sample.yaml
index 363d3f71..61831bef 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-start-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-start-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: vf-model-certify-start
     input: --vf-id 66269482-0b27-40e3-9c4d-6a26fb67d9ff
-    moco: vf-model-certify-start-schema-1.1-moco.json
+    moco: vf-model-certify-start-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-checkin-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-checkin-schema-beijing-sample.yaml
index b59f0d03..68f025ca 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-checkin-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-checkin-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: vf-model-checkin
     input: --vf-id 66269482-0b27-40e3-9c4d-6a26fb67d9ff
-    moco: vf-model-checkin-schema-1.1-moco.json
+    moco: vf-model-checkin-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-create-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-create-schema-beijing-sample.yaml
index 2f13de09..0433902b 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-create-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-create-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vf-model-create
     input: --name kanag-cli-VLB --description VF created from CLI --vendor-name Kanag-cli --vsp-id f19cad8343794e93acb9cda2e4126281 --vsp-version 2.0
-    moco: vf-model-create-schema-1.1-moco.json
+    moco: vf-model-create-schema-beijing-moco.json
     output: |
       +----------+--------------------------------------+
       |property  |value                                 |
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-list-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-list-schema-beijing-sample.yaml
index 2424bd25..93fef2bf 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-list-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-list-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vf-model-list
     input:
-    moco: vf-model-list-schema-1.1-moco.json
+    moco: vf-model-list-schema-beijing-moco.json
     output: |
       +--------------------------------------+--------------------------------------+--------------------------------------+--------------------------+----------+------------+
       |uuid                                  |uniqueid                              |invariant-uuid                        |name                      |version   |status      |
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf2vfmodule-model-list-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf2vfmodule-model-list-schema-beijing-sample.yaml
index 6c853cb0..a9fba81e 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf2vfmodule-model-list-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vf/vf2vfmodule-model-list-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vf2vfmodule-model-list
     input: --vf-id 66269482-0b27-40e3-9c4d-6a26fb67d9ff
-    moco: vf2vfmodule-model-list-schema-1.1-moco.json
+    moco: vf2vfmodule-model-list-schema-beijing-moco.json
     output: |
       +----------------------------------+--------------+--------------------------------------+--------------------------------------+------------------------------------+----------------+
       |vsp-uuid                          |vsp-version   |module-uuid                           |module-invariant-uuid                 |module-name                         |module-version  |
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-beijing-sample.yaml
index 6601b866..83742213 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vlm-aggreement-create
     input: --name kanag-cli-la --description kanag cli la --vlm-feature-group-id 3a2fb75b52a54e9c8093e7c154210f9e --vlm-id cf2d907d998e44698ce3b4cded5f66a7 --vlm-version 1.1
-    moco: vlm-aggreement-create-schema-1.1-moco.json
+    moco: vlm-aggreement-create-schema-beijing-moco.json
     output: |
       +----------+----------------------------------+
       |property  |value                             |
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-list-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-list-schema-beijing-sample.yaml
index 01823724..1481c0e9 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-list-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-list-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vlm-aggreement-list
     input: --vlm-id cf2d907d998e44698ce3b4cded5f66a7 --vlm-version 2.0
-    moco: vlm-aggreement-list-schema-1.1-moco.json
+    moco: vlm-aggreement-list-schema-beijing-moco.json
     output: |
       +----------------------------------+--------------+
       |ID                                |name          |
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-checkin-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-checkin-schema-beijing-sample.yaml
index 8f2a2eee..c80bf0fb 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-checkin-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-checkin-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: vlm-checkin
     input: --vlm-id cf2d907d998e44698ce3b4cded5f66a7 --vlm-version 1.1
-    moco: vlm-checkin-schema-1.1-moco.json
+    moco: vlm-checkin-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-checkout-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-checkout-schema-beijing-sample.yaml
index 490737f2..73f718e8 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-checkout-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-checkout-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: vlm-checkout
     input: --vlm-id cf2d907d998e44698ce3b4cded5f66a7 --vlm-version 0.1
-    moco: vlm-checkout-schema-1.1-moco.json
+    moco: vlm-checkout-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-create-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-create-schema-beijing-sample.yaml
index 31f9e08e..cb235c5d 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-create-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-create-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vlm-create
     input: --vendor-name kanag-cli --description First License created from CLI
-    moco: vlm-create-schema-1.1-moco.json
+    moco: vlm-create-schema-beijing-moco.json
     output: |
       +----------+----------------------------------+
       |property  |value                             |
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-beijing-sample.yaml
index e5489299..9bdb703b 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vlm-entitlement-pool-create
     input: --name kanag-cli-ep --vlm-id cf2d907d998e44698ce3b4cded5f66a7 --description kanag vlm ep --manufacture-reference-number mkr123456 -d --vlm-version 0.1
-    moco: vlm-entitlement-pool-create-schema-1.1-moco.json
+    moco: vlm-entitlement-pool-create-schema-beijing-moco.json
     output: |
       +----------+----------------------------------+
       |property  |value                             |
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-entitlement-pool-list-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-entitlement-pool-list-schema-beijing-sample.yaml
index d42dd365..718f985f 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-entitlement-pool-list-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-entitlement-pool-list-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vlm-entitlement-pool-list
     input: --vlm-id cf2d907d998e44698ce3b4cded5f66a7 --vlm-version 2.0
-    moco: vlm-entitlement-pool-list-schema-1.1-moco.json
+    moco: vlm-entitlement-pool-list-schema-beijing-moco.json
     output: |
       +----------------------------------+--------------------------+
       |ID                                |name                      |
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-beijing-sample.yaml
index 36512ee9..675b6b50 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vlm-feature-group-create
     input: --name kanag-cli-fg --description Kanag cli feature group --vlm-id cf2d907d998e44698ce3b4cded5f66a7 --vlm-version 0.1 --vlm-key-group-id c37a1f205f444161a573f55dfec5f170 --vlm-entitle-pool-id aa61080fd965455ba5edbf60f4e375ef --part-number 123455 --manufacture-reference-number mkr123456
-    moco: vlm-feature-group-create-schema-1.1-moco.json
+    moco: vlm-feature-group-create-schema-beijing-moco.json
     output: |
       +----------+----------------------------------+
       |property  |value                             |
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-feature-group-list-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-feature-group-list-schema-beijing-sample.yaml
index e475e1b1..f74cb12b 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-feature-group-list-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-feature-group-list-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vlm-feature-group-list
     input: --vlm-id cf2d907d998e44698ce3b4cded5f66a7 --vlm-version 2.0
-    moco: vlm-feature-group-list-schema-1.1-moco.json
+    moco: vlm-feature-group-list-schema-beijing-moco.json
     output: |
       +----------------------------------+--------------+
       |ID                                |name          |
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-key-group-create-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-key-group-create-schema-beijing-sample.yaml
index 6b90d237..4ae3281e 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-key-group-create-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-key-group-create-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vlm-key-group-create
     input: --vlm-id cf2d907d998e44698ce3b4cded5f66a7 --name kanag-cli-kg --description Kanag CLI key group -d --vlm-version 0.1
-    moco: vlm-key-group-create-schema-1.1-moco.json
+    moco: vlm-key-group-create-schema-beijing-moco.json
     output: |
       |property  |value                             |
       +----------+----------------------------------+
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-key-group-list-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-key-group-list-schema-beijing-sample.yaml
index 95a1433c..827c1238 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-key-group-list-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-key-group-list-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vlm-key-group-list
     input: --vlm-id cf2d907d998e44698ce3b4cded5f66a7 --vlm-version 2.0
-    moco: vlm-key-group-list-schema-1.1-moco.json
+    moco: vlm-key-group-list-schema-beijing-moco.json
     output: |
       +----------------------------------+----------------------+
       |ID                                |name                  |
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-list-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-list-schema-beijing-sample.yaml
index 0e7682ec..1780a458 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-list-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-list-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vlm-list
     input: --long
-    moco: vlm-list-schema-1.1-moco.json
+    moco: vlm-list-schema-beijing-moco.json
     output: |
       +----------------------------------+--------------------------+--------------+--------+--------------------------------+
       |id                                |vendor-name               |vlm-version   |status  |description                     |
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-revert-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-revert-schema-beijing-sample.yaml
index 53577480..37b59052 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-revert-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-revert-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: vlm-revert
     input: --vlm-id cf2d907d998e44698ce3b4cded5f66a7 --vlm-version 0.1
-    moco: vlm-revert-schema-1.1-moco.json
+    moco: vlm-revert-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-submit-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-submit-schema-beijing-sample.yaml
index 27e28764..3ff0803c 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-submit-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-submit-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: vlm-submit
     input: --vlm-id cf2d907d998e44698ce3b4cded5f66a7 --vlm-version 1.1
-    moco: vlm-submit-schema-1.1-moco.json
+    moco: vlm-submit-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-checkin-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-checkin-schema-beijing-sample.yaml
index 747e61d5..fae4a20d 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-checkin-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-checkin-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: vsp-checkin
     input: --vsp-id f19cad8343794e93acb9cda2e4126281 --vsp-version 0.1
-    moco: vsp-checkin-schema-1.1-moco.json
+    moco: vsp-checkin-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-checkout-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-checkout-schema-beijing-sample.yaml
index a0d6fac6..ac1e6860 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-checkout-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-checkout-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: vsp-checkout
     input: --vsp-id f19cad8343794e93acb9cda2e4126281 --vsp-version 0.1
-    moco: vsp-checkout-schema-1.1-moco.json
+    moco: vsp-checkout-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-beijing-sample.yaml
index 8b0cbad6..7dcdeeb1 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vsp-create
     input: --vsp-name kanag-cli-VLB --vsp-description VLB created from CLI --vlm-agreement-id 77e151d0503b45ecb7e40f5f5f1a887e --vlm-version 2.0 --vlm-feature-group-id 3a2fb75b52a54e9c8093e7c154210f9e --vlm-id cf2d907d998e44698ce3b4cded5f66a7 --vlm-vendor Kanag-cli
-    moco: vsp-create-schema-1.1-moco.json
+    moco: vsp-create-schema-beijing-moco.json
     output: |
       +----------+----------------------------------+
       |property  |value                             |
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-list-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-list-schema-beijing-sample.yaml
index 3c6b20d3..d23638ed 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-list-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-list-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vsp-list
     input:
-    moco: vsp-list-schema-1.1-moco.json
+    moco: vsp-list-schema-beijing-moco.json
     output: |
       +----------------------------------+----------------------------------------------------+----------+------------+
       |ID                                |name                                                |version   |status      |
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-package-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-package-schema-beijing-sample.yaml
index 8540140b..684498a0 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-package-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-package-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: vsp-package
     input: --vsp-id f19cad8343794e93acb9cda2e4126281 --vsp-version 0.2
-    moco: vsp-package-schema-1.1-moco.json
+    moco: vsp-package-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-revert-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-revert-schema-beijing-sample.yaml
index 6b9fb054..9cec4f14 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-revert-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-revert-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: vsp-revert
     input: --vsp-id e65baf44883e4868ba96f9faed9ba97a --vsp-version 0.2
-    moco: vsp-revert-schema-1.1-moco.json
+    moco: vsp-revert-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-show-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-show-schema-beijing-sample.yaml
index 7dccd06a..06a4fc4e 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-show-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-show-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vsp-show
     input: --vsp-id a8cd007fa101470e98516cd4549c568f --vsp-version 1.0 --long
-    moco: vsp-show-schema-1.1-moco.json
+    moco: vsp-show-schema-beijing-moco.json
     output: |
       +--------------+----------------------------------+
       |property      |value                             |
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-submit-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-submit-schema-beijing-sample.yaml
index 3292a797..094ed34f 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-submit-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-submit-schema-beijing-sample.yaml
@@ -19,5 +19,5 @@ samples:
   sample1:
     name: vsp-submit
     input: --vsp-id f19cad8343794e93acb9cda2e4126281 --vsp-version 0.1
-    moco: vsp-submit-schema-1.1-moco.json
+    moco: vsp-submit-schema-beijing-moco.json
     output:
\ No newline at end of file
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-beijing-sample.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-beijing-sample.yaml
index 16fea4f8..0babfdc2 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-validate-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vsp-validate
     input: --vsp-id f19cad8343794e93acb9cda2e4126281 --vsp-version 0.1
-    moco: vsp-validate-schema-1.1-moco.json
+    moco: vsp-validate-schema-beijing-moco.json
     output: |
       +----------+----------------------------------------------------+
       |property  |value                                               |
diff --git a/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-create-schema-beijing-sample.yaml b/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-create-schema-beijing-sample.yaml
index 41552611..827c7474 100644
--- a/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-create-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-create-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: service-create
     input: --cloud-region RegionOne --tenant-id onap --model-invariant-id 1de901ed-17af-4b03-bc1f-41659cfa27cb --model-uuid ace39141-09ec-4068-b06d-ac6b23bdc6e0 --model-name demoVLB --model-version 1.0 -c Demonstration --instance-name sample-service-onap-cli-13 --service-type vLB
-    moco: service-create-schema-1.1-moco.json
+    moco: service-create-schema-beijing-moco.json
     output: |
       +--------------+--------------------------------------+
       |property      |value                                 |
diff --git a/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/vf-create-schema-beijing-sample.yaml b/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/vf-create-schema-beijing-sample.yaml
index 713a58d2..bbe549c7 100644
--- a/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/vf-create-schema-beijing-sample.yaml
+++ b/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/vf-create-schema-beijing-sample.yaml
@@ -19,7 +19,7 @@ samples:
   sample1:
     name: vf-create
     input: --cloud-region RegionOne --tenant-id onap --product-family vLB --instance-name vlb-cli-sample-11 --service-instance-id 2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee --vf-model-invariant-id cc34cd54-dd7c-44cd-8847-f9577c6f1a49 --vf-model-uuid 8b1f63f3-e0cc-4c27-8903-fafe2f25bfbe --vf-model-name 847cb26a-59a6-475a-94dd --vf-model-version 1.0 --vf-model-customization-id cf893f5a-1bb1-4e32-a92b-2456e12178f8 --service-model-invariant-id 1de901ed-17af-4b03-bc1f-41659cfa27cb --service-model-uuid ace39141-09ec-4068-b06d-ac6b23bdc6e0 --service-model-name demoVLB --service-model-version 1.0 -m http://192.168.17.121:8080 -u InfraPortalClient -p password1$
-    moco: vf-create-schema-1.1-moco.json
+    moco: vf-create-schema-beijing-moco.json
     output: |
       +--------------+--------------------------------------+
       |property      |value                                 |