summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-09-26 23:38:29 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-11-14 14:39:16 +0530
commitd39f12c5af170277b2c3daf8cff86553e3a0d2ec (patch)
tree468e7898c00b844b41896362d7404e8356448173
parentabf5898650417a9726c8eb8924b4b3aaebf54523 (diff)
Re-org plugins into tree of product versions
Issue-Id: CLI-66 Change-Id: I2591bc380387200f727aae7e5db851a3c3a19fc3 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
-rw-r--r--plugins/onap-1.0/auth/pom.xml (renamed from plugins/aai/pom.xml)6
-rw-r--r--plugins/onap-1.0/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommand.java30
-rw-r--r--plugins/onap-1.0/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommand.java30
-rw-r--r--plugins/onap-1.0/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommand.java30
-rw-r--r--plugins/onap-1.0/auth/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand (renamed from plugins/auth/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand)0
-rw-r--r--plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-login-onap-1-0.yaml32
-rw-r--r--plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-0.yaml37
-rw-r--r--plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-0.yaml14
-rw-r--r--plugins/onap-1.0/catalog/pom.xml (renamed from plugins/catalog/pom.xml)6
-rw-r--r--plugins/onap-1.0/catalog/src/main/resources/open-cli-schema/catalog-onap-1-0.yaml54
-rw-r--r--plugins/onap-1.0/features/aai/pom.xml41
-rw-r--r--plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema.yaml)0
-rw-r--r--plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/customer/customer-create-schema.yaml)0
-rw-r--r--plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema.yaml)0
-rw-r--r--plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/customer/customer-list-schema.yaml)0
-rw-r--r--plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/customer/customer-show-schema.yaml)0
-rw-r--r--plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema.yaml)0
-rw-r--r--plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema.yaml)0
-rw-r--r--plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema.yaml)0
-rw-r--r--plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema.yaml)0
-rw-r--r--plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema.yaml)0
-rw-r--r--plugins/onap-1.0/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.0.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-sample-1.0.yaml)0
-rw-r--r--plugins/onap-1.0/features/pom.xml70
-rw-r--r--plugins/onap-1.0/features/sdc/pom.xml (renamed from plugins/sdc/pom.xml)6
-rw-r--r--plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml41
-rw-r--r--plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-show-schema.yaml50
-rw-r--r--plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml (renamed from plugins/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml)0
-rw-r--r--plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml (renamed from plugins/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml)0
-rw-r--r--plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml (renamed from plugins/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml)0
-rw-r--r--plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml (renamed from plugins/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml)0
-rw-r--r--plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml (renamed from plugins/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml)0
-rw-r--r--plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml (renamed from plugins/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml)0
-rw-r--r--plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml (renamed from plugins/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml)0
-rw-r--r--plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-sample.yaml)0
-rw-r--r--plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-sample.yaml)0
-rw-r--r--plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-sample.yaml)0
-rw-r--r--plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-sample.yaml)0
-rw-r--r--plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-sample.yaml)0
-rw-r--r--plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-sample.yaml)0
-rw-r--r--plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-upload-sample.yaml)0
-rw-r--r--plugins/onap-1.0/pom.xml71
-rw-r--r--plugins/onap-1.1/auth/pom.xml (renamed from plugins/auth/pom.xml)6
-rw-r--r--plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommand.java (renamed from plugins/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommand.java)0
-rw-r--r--plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommand.java (renamed from plugins/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommand.java)0
-rw-r--r--plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommand.java (renamed from plugins/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommand.java)0
-rw-r--r--plugins/onap-1.1/auth/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand3
-rw-r--r--plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-login-onap-1-1.yaml (renamed from plugins/auth/src/main/resources/open-cli-schema/basic-login-onap-1-1.yaml)0
-rw-r--r--plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-1.yaml (renamed from plugins/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-1.yaml)0
-rw-r--r--plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-1.yaml (renamed from plugins/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-1.yaml)0
-rw-r--r--plugins/onap-1.1/catalog/pom.xml (renamed from plugins/msb/pom.xml)6
-rw-r--r--plugins/onap-1.1/catalog/src/main/resources/open-cli-schema/catalog-onap-1_1.yaml (renamed from plugins/catalog/src/main/resources/open-cli-schema/catalog-onap-1_1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/pom.xml41
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-create-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/cloud-region/cloud-create-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/customer/customer-create-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/customer/customer-list-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/customer/customer-show-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-delete-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-delete-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-create-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/tenant/tenant-create-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-delete-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/tenant/tenant-delete-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-list-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/open-cli-schema/tenant/tenant-list-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.1.yaml18
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-create-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-sample-1.1.yaml9
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-list-sample-1.1.yaml18
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-show-sample-1.1.yaml23
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-sample-1.1.yaml13
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-sample-1.1.yaml14
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-sample-1.1.yaml24
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-sample-1.1.yaml16
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-sample-1.1.yaml23
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-sample-1.1.yaml9
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-sample-1.1.yaml14
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-sample-1.1.yaml25
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-create-sample-1.1.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-create-sample-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-delete-sample-1.1.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-delete-sample-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-list-sample-1.1.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-list-sample-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/msb/pom.xml41
-rw-r--r--plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceCreateCommand.java (renamed from plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceCreateCommand.java)0
-rw-r--r--plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceDeleteCommand.java (renamed from plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceDeleteCommand.java)0
-rw-r--r--plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceListCommand.java (renamed from plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceListCommand.java)0
-rw-r--r--plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceShowCommand.java (renamed from plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceShowCommand.java)0
-rw-r--r--plugins/onap-1.1/features/msb/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand (renamed from plugins/msb/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand)0
-rw-r--r--plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-create-schema.yaml (renamed from plugins/msb/src/main/resources/open-cli-schema/microservice-create-schema.yaml)0
-rw-r--r--plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-delete-schema.yaml (renamed from plugins/msb/src/main/resources/open-cli-schema/microservice-delete-schema.yaml)0
-rw-r--r--plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-list-schema.yaml (renamed from plugins/msb/src/main/resources/open-cli-schema/microservice-list-schema.yaml)0
-rw-r--r--plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-show-schema.yaml (renamed from plugins/msb/src/main/resources/open-cli-schema/microservice-show-schema.yaml)0
-rw-r--r--plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-create-service-sample-1.1.yaml (renamed from plugins/msb/src/test/resources/onap-cli-sample/msb-create-service-sample-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-delete-service-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-list-service-sample-1.1.yaml14
-rw-r--r--plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-show-service-sample-1.1.yaml14
-rw-r--r--plugins/onap-1.1/features/pom.xml72
-rw-r--r--plugins/onap-1.1/features/sdc/pom.xml39
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml41
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-show-schema.yaml50
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml27
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml28
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml79
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml32
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml45
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml27
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml33
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml8
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml9
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml14
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml18
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml14
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml8
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml8
-rw-r--r--plugins/onap-1.1/features/so/pom.xml41
-rw-r--r--plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml (renamed from plugins/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml (renamed from plugins/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml (renamed from plugins/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml (renamed from plugins/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-create-schema-1.1.yaml (renamed from plugins/so/src/main/resources/open-cli-schema/services/vnf-create-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-delete-schema-1.1.yaml (renamed from plugins/so/src/main/resources/open-cli-schema/services/vnf-delete-schema-1.1.yaml)0
-rw-r--r--plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-delete-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-create-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-delete-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-create-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-delete-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/pom.xml71
-rw-r--r--plugins/pom.xml11
-rw-r--r--plugins/so/pom.xml41
157 files changed, 1654 insertions, 63 deletions
diff --git a/plugins/aai/pom.xml b/plugins/onap-1.0/auth/pom.xml
index 98514b8d..15da812b 100644
--- a/plugins/aai/pom.xml
+++ b/plugins/onap-1.0/auth/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.onap.cli</groupId>
- <artifactId>cli-plugins</artifactId>
+ <artifactId>cli-plugins-onap-1.0</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>cli-plugins-aai</artifactId>
- <name>cli/plugins/aai</name>
+ <artifactId>cli-plugins-onap-1.0-auth</artifactId>
+ <name>cli/plugins/onap-1.0/auth</name>
<packaging>jar</packaging>
<build>
<plugins>
diff --git a/plugins/onap-1.0/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommand.java b/plugins/onap-1.0/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommand.java
new file mode 100644
index 00000000..b441d3bd
--- /dev/null
+++ b/plugins/onap-1.0/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommand.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2017 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.
+ * 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.
+ */
+
+package org.onap.cli.cmd.auth;
+
+import org.onap.cli.fw.OnapCommandSchema;
+import org.onap.cli.fw.cmd.BasicAuthLoginCommand;
+import org.onap.cli.fw.error.OnapCommandException;
+
+@OnapCommandSchema(name = "basic-login", version = "onap-1.0", type = "auth", schema = "basic-login-onap-1-0.yaml")
+public class OnapBasicAuthLoginCommand extends BasicAuthLoginCommand {
+
+ @Override
+ protected void run() throws OnapCommandException {
+ super.run();
+ }
+}
diff --git a/plugins/onap-1.0/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommand.java b/plugins/onap-1.0/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommand.java
new file mode 100644
index 00000000..8b44b5cc
--- /dev/null
+++ b/plugins/onap-1.0/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommand.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2017 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.
+ * 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.
+ */
+
+package org.onap.cli.cmd.auth;
+
+import org.onap.cli.fw.OnapCommandSchema;
+import org.onap.cli.fw.cmd.BasicAuthLogoutCommand;
+import org.onap.cli.fw.error.OnapCommandException;
+
+@OnapCommandSchema(name = "basic-logout", version = "onap-1.0", type = "auth", schema = "basic-logout-onap-1-0.yaml")
+public class OnapBasicAuthLogoutCommand extends BasicAuthLogoutCommand {
+
+ @Override
+ protected void run() throws OnapCommandException {
+ super.run();
+ }
+}
diff --git a/plugins/onap-1.0/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommand.java b/plugins/onap-1.0/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommand.java
new file mode 100644
index 00000000..792b9990
--- /dev/null
+++ b/plugins/onap-1.0/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommand.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2017 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.
+ * 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.
+ */
+
+package org.onap.cli.cmd.auth;
+
+import org.onap.cli.fw.OnapCommandSchema;
+import org.onap.cli.fw.cmd.BasicAuthLoginCommand;
+import org.onap.cli.fw.error.OnapCommandException;
+
+@OnapCommandSchema(name = "sdc-basic-login", version = "onap-1.0", type = "auth", schema = "basic-login-onap-sdc-1-0.yaml")
+public class OnapSdcBasicAuthLoginCommand extends BasicAuthLoginCommand {
+
+ @Override
+ protected void run() throws OnapCommandException {
+ super.run();
+ }
+}
diff --git a/plugins/auth/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand b/plugins/onap-1.0/auth/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand
index 7594b30f..7594b30f 100644
--- a/plugins/auth/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand
+++ b/plugins/onap-1.0/auth/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand
diff --git a/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-login-onap-1-0.yaml b/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-login-onap-1-0.yaml
new file mode 100644
index 00000000..1c95bf78
--- /dev/null
+++ b/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-login-onap-1-0.yaml
@@ -0,0 +1,32 @@
+open_cli_schema_version: 1.0
+
+name: basic-login
+
+description: ONAP basic login auth command
+
+version: onap-1.0
+
+type: auth
+
+service:
+ name: onap
+ version: v1
+ mode: direct
+
+results:
+ direction: portrait
+ attributes:
+ - name: Authorization
+ description: Authorization
+ scope: short
+ type: string
+ - name: X-TransactionId
+ description: X-TransactionId
+ scope: short
+ type: string
+ default_value: req-$s{uuid}
+ - name: X-FromAppId
+ description: X-FromAppId
+ scope: short
+ type: string
+ default_value: ONAP CLI
diff --git a/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-0.yaml b/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-0.yaml
new file mode 100644
index 00000000..586258f2
--- /dev/null
+++ b/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-0.yaml
@@ -0,0 +1,37 @@
+open_cli_schema_version: 1.0
+
+name: sdc-basic-login
+
+description: ONAP basic login auth command
+
+version: onap-1.0
+
+type: auth
+
+service:
+ name: onap
+ version: v1
+ mode: direct
+
+results:
+ direction: portrait
+ attributes:
+ - name: Authorization
+ description: Authorization
+ scope: short
+ type: string
+ - name: X-TransactionId
+ description: X-TransactionId
+ scope: short
+ type: string
+ default_value: req-$s{uuid}
+ - name: X-FromAppId
+ description: X-FromAppId
+ scope: short
+ type: string
+ default_value: ONAP CLI
+ - name: USER_ID
+ description: USER_ID for sdc
+ scope: short
+ type: string
+ default_value: ${host-username} \ No newline at end of file
diff --git a/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-0.yaml b/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-0.yaml
new file mode 100644
index 00000000..eb9dae8d
--- /dev/null
+++ b/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-0.yaml
@@ -0,0 +1,14 @@
+open_cli_schema_version: 1.0
+
+name: basic-logout
+
+description: ONAP basic logout auth command
+
+version: onap-1.0
+
+type: auth
+
+service:
+ name: onap
+ version: v1
+ mode: direct \ No newline at end of file
diff --git a/plugins/catalog/pom.xml b/plugins/onap-1.0/catalog/pom.xml
index 65d4f7d4..7aac33ac 100644
--- a/plugins/catalog/pom.xml
+++ b/plugins/onap-1.0/catalog/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.onap.cli</groupId>
- <artifactId>cli-plugins</artifactId>
+ <artifactId>cli-plugins-onap-1.0</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>cli-plugins-catalog</artifactId>
- <name>cli/plugins/catalog</name>
+ <artifactId>cli-plugins-onap-1.0-catalog</artifactId>
+ <name>cli/plugins/onap-1.0/catalog</name>
<packaging>jar</packaging>
<build>
<plugins>
diff --git a/plugins/onap-1.0/catalog/src/main/resources/open-cli-schema/catalog-onap-1-0.yaml b/plugins/onap-1.0/catalog/src/main/resources/open-cli-schema/catalog-onap-1-0.yaml
new file mode 100644
index 00000000..419f403b
--- /dev/null
+++ b/plugins/onap-1.0/catalog/src/main/resources/open-cli-schema/catalog-onap-1-0.yaml
@@ -0,0 +1,54 @@
+open_cli_schema_version: 1.0
+
+name: catalog
+
+description: ONAP catalog command to find the base path for service.
+
+version: onap-1.0
+
+type: catalog
+
+service:
+ name: msb
+ version: v1
+ mode: direct
+ auth: none
+
+parameters:
+ - name: catalog-service-name
+ type: string
+ description: service name registered in catalog service
+ short_option: l
+ long_option: catalog-service-name
+ is_optional: false
+ - name: catalog-service-version
+ type: string
+ description: service version registered in catalog service
+ short_option: i
+ long_option: catalog-service-version
+ is_optional: false
+results:
+ direction: portrait
+ attributes:
+ - name: catalog-service-host-url
+ description: Service connection url
+ scope: short
+ type: string
+ default_value: ${host-url}
+ - name: catalog-service-base-path
+ description: service base path, to append with host-url for connecting the service.
+ scope: short
+ type: string
+ default_value: /
+http:
+ request:
+ uri: /services/${catalog-service-name}/version/${catalog-service-version}
+ method: GET
+ success_codes:
+ - 201
+ - 200
+ result_map:
+ catalog-service-base-path: $b{$.url}
+ catalog-service-host-url: ${host-url}
+ sample_response:
+ body: '{"serviceName":"test","version":"v1","url":"/api/test/v1","protocol":"REST","visualRange":"1","lb_policy":"hash","nodes":[{"ip":"127.0.0.1","port":"8012","ttl":0,"nodeId":"test_127.0.0.1_8012","expiration":"2017-02-10T05:33:25Z","created_at":"2017-02-10T05:33:25Z","updated_at":"2017-02-10T05:33:25Z"}],"status":"1"}'
diff --git a/plugins/onap-1.0/features/aai/pom.xml b/plugins/onap-1.0/features/aai/pom.xml
new file mode 100644
index 00000000..236517ea
--- /dev/null
+++ b/plugins/onap-1.0/features/aai/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2017 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.
+ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.onap.cli</groupId>
+ <artifactId>cli-plugins-onap-1.0-features</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>cli-plugins-onap-1.0-features-aai</artifactId>
+ <name>cli/plugins/onap-1.0/features/aai</name>
+ <packaging>jar</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/plugins/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema.yaml b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema.yaml
index 10a7e954..10a7e954 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema.yaml
+++ b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-create-schema.yaml b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema.yaml
index e79cd5e6..e79cd5e6 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-create-schema.yaml
+++ b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema.yaml b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema.yaml
index 48455cdc..48455cdc 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema.yaml
+++ b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-list-schema.yaml b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema.yaml
index 0866cfb4..0866cfb4 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-list-schema.yaml
+++ b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-show-schema.yaml b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema.yaml
index bb37aa27..bb37aa27 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-show-schema.yaml
+++ b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema.yaml b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema.yaml
index f8a73841..f8a73841 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema.yaml
+++ b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema.yaml b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema.yaml
index a2b438b6..a2b438b6 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema.yaml
+++ b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema.yaml b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema.yaml
index bdff43c3..bdff43c3 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema.yaml
+++ b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema.yaml b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema.yaml
index a45f8cfd..a45f8cfd 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema.yaml
+++ b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema.yaml b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema.yaml
index 634c5cb2..634c5cb2 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema.yaml
+++ b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema.yaml
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-sample-1.0.yaml b/plugins/onap-1.0/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.0.yaml
index 9b267481..9b267481 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-sample-1.0.yaml
+++ b/plugins/onap-1.0/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.0.yaml
diff --git a/plugins/onap-1.0/features/pom.xml b/plugins/onap-1.0/features/pom.xml
new file mode 100644
index 00000000..8c9592c2
--- /dev/null
+++ b/plugins/onap-1.0/features/pom.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2017 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.
+ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.onap.cli</groupId>
+ <artifactId>cli-plugins-onap-1.0</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>cli-plugins-onap-1.0-features</artifactId>
+ <name>cli/plugins/onap-1.0/features</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>aai</module>
+ <module>sdc</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-artifact</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <type>${project.packaging}</type>
+ </artifactItem>
+ </artifactItems>
+ <!-- copy to plugin dependencies -->
+ <outputDirectory>../../../../plugins/target/lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
diff --git a/plugins/sdc/pom.xml b/plugins/onap-1.0/features/sdc/pom.xml
index 01285558..de46a506 100644
--- a/plugins/sdc/pom.xml
+++ b/plugins/onap-1.0/features/sdc/pom.xml
@@ -21,12 +21,12 @@
<parent>
<groupId>org.onap.cli</groupId>
- <artifactId>cli-plugins</artifactId>
+ <artifactId>cli-plugins-onap-1.0-features</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>cli-plugins-sdc</artifactId>
- <name>cli/plugins/sdc</name>
+ <artifactId>cli-plugins-onap-1.0-features-sdc</artifactId>
+ <name>cli/plugins/onap-1.0/features/sdc</name>
<packaging>jar</packaging>
<build>
<plugins>
diff --git a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml
new file mode 100644
index 00000000..58a8681a
--- /dev/null
+++ b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml
@@ -0,0 +1,41 @@
+open_cli_schema_version: 1.0
+name: license-model-create
+description: Create License Model
+version: onap-1.0
+service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
+
+parameters:
+ - name: vendor-name
+ description: vendor name
+ type: string
+ short_option: x
+ long_option: vendor-name
+ is_optional: false
+ - name: license-model-description
+ description: Description for License Model
+ type: string
+ short_option: y
+ long_option: license-model-description
+ is_optional: true
+results:
+ direction: portrait
+ attributes:
+ - name: ID
+ description: License Model ID
+ scope: short
+ type: string
+http:
+ request:
+ uri: /onboarding-api/v1.0/vendor-license-models
+ method: POST
+ body: '{"vendorName": "${vendor-name}", "description": "${license-model-description}", "iconRef": "icon"}'
+ success_codes:
+ - 200
+ result_map:
+ ID: $b{$.value}
+ sample_response:
+ body: '{"value":"2DEB6CB4B082415BB7A697C9CD1273BA"}'
diff --git a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-show-schema.yaml b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-show-schema.yaml
new file mode 100644
index 00000000..8214c19c
--- /dev/null
+++ b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-show-schema.yaml
@@ -0,0 +1,50 @@
+open_cli_schema_version: 1.0
+name: license-model-show
+description: Details of the License Model
+version: onap-1.0
+service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
+
+parameters:
+ - name: license-model-id
+ description: Onap License Model ID
+ type: string
+ short_option: x
+ long_option: license-model-id
+ is_optional: false
+
+results:
+ direction: landscape
+ attributes:
+ - name: name
+ description: License Model Name
+ scope: short
+ type: string
+ - name: ID
+ description: License Model ID
+ scope: short
+ type: string
+ - name: description
+ description: Description for the License Model
+ scope: short
+ type: string
+ - name: status
+ description: Status of the License Model
+ scope: short
+ type: string
+http:
+ request:
+ uri: /onboarding-api/v1.0/vendor-software-products/${license-model-id}
+ method: GET
+ success_codes:
+ - 200
+ result_map:
+ name: $b{$.vendorName}
+ ID: $b{$.id}
+ description: $b{$.description}
+ status: $b{$.status}
+ sample_response:
+ body: '{"vendorName": "5aa8a88c","description": "vendor license model","iconRef": "icon","id": "109F0F948B974D998D89893A1BD39D4A","version": "0.1","status": "Locked","lockingUser": "cs0008","viewableVersions": ["0.1"]}'
diff --git a/plugins/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml
index 4522b41d..4522b41d 100644
--- a/plugins/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml
+++ b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml
diff --git a/plugins/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml
index d790ce55..d790ce55 100644
--- a/plugins/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml
+++ b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml
diff --git a/plugins/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml
index 4ce83d4b..4ce83d4b 100644
--- a/plugins/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml
+++ b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml
diff --git a/plugins/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml
index f171b442..f171b442 100644
--- a/plugins/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml
+++ b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml
diff --git a/plugins/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml
index 47cc462e..47cc462e 100644
--- a/plugins/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml
+++ b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml
diff --git a/plugins/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml
index d5f1733f..d5f1733f 100644
--- a/plugins/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml
+++ b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml
diff --git a/plugins/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml
index 28d8c0a5..28d8c0a5 100644
--- a/plugins/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml
+++ b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml
index 43023fe6..43023fe6 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-sample.yaml
+++ b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml
index d7a9e375..d7a9e375 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-sample.yaml
+++ b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml
index d5b7432f..d5b7432f 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-sample.yaml
+++ b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml
index fe494ace..fe494ace 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-sample.yaml
+++ b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml
index 99cd88ed..99cd88ed 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-sample.yaml
+++ b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml
index 55ceaf32..55ceaf32 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-sample.yaml
+++ b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-upload-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml
index 344dcc9e..344dcc9e 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-upload-sample.yaml
+++ b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml
diff --git a/plugins/onap-1.0/pom.xml b/plugins/onap-1.0/pom.xml
new file mode 100644
index 00000000..0d583115
--- /dev/null
+++ b/plugins/onap-1.0/pom.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2017 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.
+ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.onap.cli</groupId>
+ <artifactId>cli-plugins</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>cli-plugins-onap-1.0</artifactId>
+ <name>cli/plugins/onap-1.0</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>auth</module>
+ <module>catalog</module>
+ <module>features</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-artifact</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <type>${project.packaging}</type>
+ </artifactItem>
+ </artifactItems>
+ <!-- copy to plugin dependencies -->
+ <outputDirectory>../../../plugins/target/lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
diff --git a/plugins/auth/pom.xml b/plugins/onap-1.1/auth/pom.xml
index fac9abb8..481a6bb1 100644
--- a/plugins/auth/pom.xml
+++ b/plugins/onap-1.1/auth/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.onap.cli</groupId>
- <artifactId>cli-plugins</artifactId>
+ <artifactId>cli-plugins-onap-1.1</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>cli-plugins-auth</artifactId>
- <name>cli/plugins/auth</name>
+ <artifactId>cli-plugins-onap-1.1-auth</artifactId>
+ <name>cli/plugins/onap-1.1/auth</name>
<packaging>jar</packaging>
<build>
<plugins>
diff --git a/plugins/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommand.java b/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommand.java
index 3d621fc5..3d621fc5 100644
--- a/plugins/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommand.java
+++ b/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommand.java
diff --git a/plugins/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommand.java b/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommand.java
index ff12500c..ff12500c 100644
--- a/plugins/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommand.java
+++ b/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommand.java
diff --git a/plugins/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommand.java b/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommand.java
index 2f5a119b..2f5a119b 100644
--- a/plugins/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommand.java
+++ b/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommand.java
diff --git a/plugins/onap-1.1/auth/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand b/plugins/onap-1.1/auth/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand
new file mode 100644
index 00000000..7594b30f
--- /dev/null
+++ b/plugins/onap-1.1/auth/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand
@@ -0,0 +1,3 @@
+org.onap.cli.cmd.auth.OnapBasicAuthLoginCommand
+org.onap.cli.cmd.auth.OnapBasicAuthLogoutCommand
+org.onap.cli.cmd.auth.OnapSdcBasicAuthLoginCommand \ No newline at end of file
diff --git a/plugins/auth/src/main/resources/open-cli-schema/basic-login-onap-1-1.yaml b/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-login-onap-1-1.yaml
index 8a7f14d3..8a7f14d3 100644
--- a/plugins/auth/src/main/resources/open-cli-schema/basic-login-onap-1-1.yaml
+++ b/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-login-onap-1-1.yaml
diff --git a/plugins/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-1.yaml b/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-1.yaml
index 2dba0c11..2dba0c11 100644
--- a/plugins/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-1.yaml
+++ b/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-1.yaml
diff --git a/plugins/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-1.yaml b/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-1.yaml
index fa32b8b9..fa32b8b9 100644
--- a/plugins/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-1.yaml
+++ b/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-1.yaml
diff --git a/plugins/msb/pom.xml b/plugins/onap-1.1/catalog/pom.xml
index 18a76f87..30a83340 100644
--- a/plugins/msb/pom.xml
+++ b/plugins/onap-1.1/catalog/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.onap.cli</groupId>
- <artifactId>cli-plugins</artifactId>
+ <artifactId>cli-plugins-onap-1.1</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>cli-plugins-msb</artifactId>
- <name>cli/plugins/msb</name>
+ <artifactId>cli-plugins-onap-1.1-catalog</artifactId>
+ <name>cli/plugins/onap-1.1/catalog</name>
<packaging>jar</packaging>
<build>
<plugins>
diff --git a/plugins/catalog/src/main/resources/open-cli-schema/catalog-onap-1_1.yaml b/plugins/onap-1.1/catalog/src/main/resources/open-cli-schema/catalog-onap-1_1.yaml
index 27deedef..27deedef 100644
--- a/plugins/catalog/src/main/resources/open-cli-schema/catalog-onap-1_1.yaml
+++ b/plugins/onap-1.1/catalog/src/main/resources/open-cli-schema/catalog-onap-1_1.yaml
diff --git a/plugins/onap-1.1/features/aai/pom.xml b/plugins/onap-1.1/features/aai/pom.xml
new file mode 100644
index 00000000..c1856a01
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2017 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.
+ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.onap.cli</groupId>
+ <artifactId>cli-plugins-onap-1.1-features</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>cli-plugins-onap-1.1-features-aai</artifactId>
+ <name>cli/plugins/onap-1.1/features/aai</name>
+ <packaging>jar</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/plugins/aai/src/main/resources/open-cli-schema/cloud-region/cloud-create-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-create-schema-1.1.yaml
index 8657ae14..8657ae14 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/cloud-region/cloud-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-create-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml
index 5575f7f7..5575f7f7 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-1.1.yaml
index c9fd5368..c9fd5368 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-create-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema-1.1.yaml
index 41c1515c..41c1515c 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema-1.1.yaml
index 673cb94a..673cb94a 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema-1.1.yaml
index 1e408f78..1e408f78 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-show-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema-1.1.yaml
index f12e235a..f12e235a 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-show-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-1.1.yaml
index 2c6c0636..2c6c0636 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-1.1.yaml
index c703c651..c703c651 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-1.1.yaml
index 7b8877bb..7b8877bb 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-1.1.yaml
index c03a75bd..c03a75bd 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml
index fe0d22a8..fe0d22a8 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml
index eec0ca67..eec0ca67 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml
index f84c480f..f84c480f 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-1.1.yaml
index d50acfb9..d50acfb9 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-1.1.yaml
index ee74ead5..ee74ead5 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-1.1.yaml
index 2af3474d..2af3474d 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml
index e8529722..e8529722 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml
index 3c99c048..3c99c048 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml
index 4318dce7..4318dce7 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml
index e447ec56..e447ec56 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema-1.1.yaml
index ffd3a964..ffd3a964 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema-1.1.yaml
index c1745b13..c1745b13 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema-1.1.yaml
index dd769c2c..dd769c2c 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema-1.1.yaml
index 1ed61eca..1ed61eca 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-delete-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-delete-schema-1.1.yaml
index 18e83fdd..18e83fdd 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-delete-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema-1.1.yaml
index a14d2da2..a14d2da2 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/tenant/tenant-create-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-create-schema-1.1.yaml
index 9bc22853..9bc22853 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/tenant/tenant-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-create-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/tenant/tenant-delete-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-delete-schema-1.1.yaml
index ece1bd5c..ece1bd5c 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/tenant/tenant-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-delete-schema-1.1.yaml
diff --git a/plugins/aai/src/main/resources/open-cli-schema/tenant/tenant-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-list-schema-1.1.yaml
index 46f470da..46f470da 100644
--- a/plugins/aai/src/main/resources/open-cli-schema/tenant/tenant-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-list-schema-1.1.yaml
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-sample-1.1.yaml
new file mode 100644
index 00000000..6a5c55c0
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: cloud-create
+version: onap-1.1
+samples:
+ sample1:
+ name: Create a cloud region in onap
+ input: -h https://locahost:8443 -u AAI -p AAI -x abc-xyz -y ABCXYZ25
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-sample-1.1.yaml
new file mode 100644
index 00000000..c84b8eca
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: cloud-delete
+version: onap-1.1
+samples:
+ sample1:
+ name: Delete the cloud region in onap
+ input: -h https://locahost:8443 -u AAI -p AAI -x abc-xyz -y ABCXYZ25 -z 1504257554519 \ No newline at end of file
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.1.yaml
new file mode 100644
index 00000000..ada90903
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.1.yaml
@@ -0,0 +1,18 @@
+onap_cli_sample_version: 1.0
+
+name: cloud-list
+version: onap-1.1
+samples:
+ sample1:
+ name: List the configured clouds in onap
+ input: -h https://locahost:8443 -u AAI -p AAI
+ output: |
+ +--------------------------------+------------------------------------+------------------+
+ |cloud |region |resource-version |
+ +--------------------------------+------------------------------------+------------------+
+ |example-cloud-owner-val-44086 |example-cloud-region-id-val-67393 |1503503677953 |
+ +--------------------------------+------------------------------------+------------------+
+ |att-aic |AAIAIC25 |1503380675 |
+ +--------------------------------+------------------------------------+------------------+
+ |abc-xyz |ABCXYZ25 |1504257554519 |
+ +--------------------------------+------------------------------------+------------------+
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-create-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-create-sample-1.1.yaml
new file mode 100644
index 00000000..d5332115
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-create-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: customer-create
+version: onap-1.1
+samples:
+ sample1:
+ name: Create a customer
+ input: -h https://locahost:8443 -u AAI -p AAI -x customer-1 -y subscriber-1
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-sample-1.1.yaml
new file mode 100644
index 00000000..9f80da02
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-sample-1.1.yaml
@@ -0,0 +1,9 @@
+onap_cli_sample_version: 1.0
+
+name: customer-delete
+version: onap-1.1
+samples:
+ sample1:
+ name: Delete the customer
+ input: -h https://locahost:8443 -u AAI -p AAI -x customer-1 -y 1504085129922
+
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-list-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-list-sample-1.1.yaml
new file mode 100644
index 00000000..feb4d7ce
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-list-sample-1.1.yaml
@@ -0,0 +1,18 @@
+onap_cli_sample_version: 1.0
+
+name: customer-list
+version: onap-1.1
+samples:
+ sample1:
+ name: List the configured customers in onap
+ input: -h https://locahost:8443 -u AAI -p AAI
+ output: |
+ +--------------------------------------+------------------+
+ |name |resource-version |
+ +--------------------------------------+------------------+
+ |example-global-customer-id-val-8741 |1504017436899 |
+ +--------------------------------------+------------------+
+ |example-global-customer-id-val-87416 |1504017249493 |
+ +--------------------------------------+------------------+
+ |customer-1 |1504085129922 |
+ +--------------------------------------+------------------+
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-show-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-show-sample-1.1.yaml
new file mode 100644
index 00000000..8c2e8dbd
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-show-sample-1.1.yaml
@@ -0,0 +1,23 @@
+onap_cli_sample_version: 1.0
+
+name: customer-show
+version: onap-1.1
+samples:
+ sample1:
+ name: Show complete details of a customer
+ input: -h https://locahost:8443 -u AAI -p AAI -x example-global-customer-id-val-8741 --long
+ output: |
+ +--------------------------------------+----------------------------------+------------------+------------------------------------+
+ |name |subscriber-name |resource-version |subscriber-type |
+ +--------------------------------------+----------------------------------+------------------+------------------------------------+
+ |example-global-customer-id-val-8741 |example-subscriber-name-val-2447 |1504017436899 |example-subscriber-type-val-24368 |
+ +--------------------------------------+----------------------------------+------------------+------------------------------------+
+ sample2:
+ name: Show basic details of a customer
+ input: -h https://locahost:8443 -u AAI -p AAI -x example-global-customer-id-val-8741
+ output: |
+ +--------------------------------------+----------------------------------+
+ |name |subscriber-name |
+ +--------------------------------------+----------------------------------+
+ |example-global-customer-id-val-8741 |example-subscriber-name-val-2447 |
+ +--------------------------------------+----------------------------------+
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-sample-1.1.yaml
new file mode 100644
index 00000000..2856ba62
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: ems-register
+version: onap-1.1
+samples:
+ sample1:
+ name: Create a ems
+ input: -z f962fa1e-d439-4b02-a122-cc38fd0da07c -b ems-1 -c OpenStack -e HW -q 1.0 -g http://locahost -i user -j password -x remote-path -d
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-sample-1.1.yaml
new file mode 100644
index 00000000..99a92785
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: ems-unregister
+version: onap-1.1
+samples:
+ sample1:
+ name: Delete the ems
+ input: -x f962fa1e-d439-4b02-a122-cc38fd0da07c -y 1505298922586
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-sample-1.1.yaml
new file mode 100644
index 00000000..88997812
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-sample-1.1.yaml
@@ -0,0 +1,13 @@
+onap_cli_sample_version: 1.0
+
+name: ems-list
+version: onap-1.1
+samples:
+ sample1:
+ name: List all ems
+ output: |
+ +--------------------------------------+------------------+
+ |ems-id |resource-version |
+ +--------------------------------------+------------------+
+ |f962fa1e-d439-4b02-a122-cc38fd0da07c |1505298922586 |
+ +--------------------------------------+------------------+
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-sample-1.1.yaml
new file mode 100644
index 00000000..e11753ac
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-sample-1.1.yaml
@@ -0,0 +1,14 @@
+onap_cli_sample_version: 1.0
+
+name: ems-show
+version: onap-1.1
+samples:
+ sample1:
+ name: Show the ems
+ input: -x f962fa1e-d439-4b02-a122-cc38fd0da07c -y 1505298922586
+ output: |
+ +--------+------------+--------+----------+------------------+
+ |name |type |vendor |version |url |
+ +--------+------------+--------+----------+------------------+
+ |ems-1 |OpenStack |HW |1.0 |http://locahost |
+ +--------+------------+--------+----------+------------------+
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-sample-1.1.yaml
new file mode 100644
index 00000000..3193f6e6
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: vim-register
+version: onap-1.1
+samples:
+ sample1:
+ name: Create a vim under given cloud region
+ input: -x cloud-1 -y region-1 -z f962fa1e-d439-4b02-a122-cc38fd0da07b -b vim-1 -c OpenStack -e HW -q 1.0 -g http://locahost -i user -j password -n default -o tenant-1 -d
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-sample-1.1.yaml
new file mode 100644
index 00000000..5a1998f4
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: vim-unregister
+version: onap-1.1
+samples:
+ sample1:
+ name: Delete the vim under given cloud region
+ input: -x cloud-1 -y region-1 -z f962fa1e-d439-4b02-a122-cc38fd0da07b -b 1505295671538
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-sample-1.1.yaml
new file mode 100644
index 00000000..d0e6d437
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-sample-1.1.yaml
@@ -0,0 +1,24 @@
+onap_cli_sample_version: 1.0
+
+name: vim-list
+version: onap-1.1
+samples:
+ sample1:
+ name: List all vim under given cloud region
+ input: -x cloud-1 -y region-1
+ output: |
+ +--------------------------------------+--------+--------+----------------+------------------+
+ |vim-id |name |vendor |default-tenant |resource-version |
+ +--------------------------------------+--------+--------+----------------+------------------+
+ |f962fa1e-d439-4b02-a122-cc38fd0da07b |vim-1 |HW |tenant-1 |1505295671538 |
+ +--------------------------------------+--------+--------+----------------+------------------+
+ sample2:
+ name: List all vim under given cloud region with complete details
+ input: -x cloud-1 -y region-1 --long
+ output: |
+ +--------------------------------------+--------+------------+--------+----------+------------------+----------+--------------+----------------+------------------+
+ |vim-id |name |type |vendor |version |url |username |cloud-domain |default-tenant |resource-version |
+ +--------------------------------------+--------+------------+--------+----------+------------------+----------+--------------+----------------+------------------+
+ |f962fa1e-d439-4b02-a122-cc38fd0da07b |vim-1 |OpenStack |HW |1.0 |http://locahost |user |default |tenant-1 |1505295671538 |
+ +--------------------------------------+--------+------------+--------+----------+------------------+----------+--------------+----------------+------------------+
+
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-sample-1.1.yaml
new file mode 100644
index 00000000..54944d41
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: vnfm-register
+version: onap-1.1
+samples:
+ sample1:
+ name: Create a vnfm
+ input: -x f962fa1e-d439-4b02-a122-cc38fd0da07c -y f962fa1e-d439-4b02-a122-cc38fd0da07c -b vnfm-2 -c OpenStack -e HW -q 1.0 -g http://locahost -i user -j password -d
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-sample-1.1.yaml
new file mode 100644
index 00000000..c6a79730
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: vnfm-unregister
+version: onap-1.1
+samples:
+ sample1:
+ name: Delete the vnfm
+ input: -x f962fa1e-d439-4b02-a122-cc38fd0da07c -y 1505298922586
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-sample-1.1.yaml
new file mode 100644
index 00000000..e3a080ed
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-sample-1.1.yaml
@@ -0,0 +1,16 @@
+onap_cli_sample_version: 1.0
+
+name: vnfm-list
+version: onap-1.1
+samples:
+ sample1:
+ name: List all vnfm
+ output: |
+ +--------------------------------------+--------------------------------------+------------------------------------+------------------+
+ |vnfm-id |vim-id |certificate-url |resource-version |
+ +--------------------------------------+--------------------------------------+------------------------------------+------------------+
+ |f962fa1e-d439-4b02-a122-cc38fd0da07c |f962fa1e-d439-4b02-a122-cc38fd0da07c | |1505299563540 |
+ +--------------------------------------+--------------------------------------+------------------------------------+------------------+
+ |htipl913-vnfm-id-val-44685 |example-vim-id-val-36801 |example-certificate-url-val-70931 |1505283495503 |
+ +--------------------------------------+--------------------------------------+------------------------------------+------------------+
+
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-sample-1.1.yaml
new file mode 100644
index 00000000..35c38d2b
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-sample-1.1.yaml
@@ -0,0 +1,23 @@
+onap_cli_sample_version: 1.0
+
+name: vnfm-show
+version: onap-1.1
+samples:
+ sample1:
+ name: Show the vnfm
+ input: -x f962fa1e-d439-4b02-a122-cc38fd0da07c
+ output: |
+ +----------+------------------+
+ |property |value |
+ +----------+------------------+
+ |name |vnfm-2 |
+ +----------+------------------+
+ |type |OpenStack |
+ +----------+------------------+
+ |vendor |HW |
+ +----------+------------------+
+ |version |1.0 |
+ +----------+------------------+
+ |url |http://locahost |
+ +----------+------------------+
+
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-sample-1.1.yaml
new file mode 100644
index 00000000..a9d01569
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: service-type-create
+version: onap-1.1
+samples:
+ sample1:
+ name: Create a service type
+ input: -h https://locahost:8443 -u AAI -p AAI -x vTest -y 26ab7af6-96cc-4c4e-814a-e533af4ef9f6
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-sample-1.1.yaml
new file mode 100644
index 00000000..46626a29
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-sample-1.1.yaml
@@ -0,0 +1,9 @@
+onap_cli_sample_version: 1.0
+
+name: service-type-delete
+version: onap-1.1
+samples:
+ sample1:
+ name: Delete the service type
+ input: -h https://locahost:8443 -u AAI -p AAI -x 26ab7af6-96cc-4c4e-814a-e533af4ef9f6 -y 1504086172338
+
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-sample-1.1.yaml
new file mode 100644
index 00000000..01ef2b93
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-sample-1.1.yaml
@@ -0,0 +1,14 @@
+onap_cli_sample_version: 1.0
+
+name: service-type-list
+version: onap-1.1
+samples:
+ sample1:
+ name: List the configured service types in onap
+ input: -h https://locahost:8443 -u AAI -p AAI
+ output: |
+ +--------------------------------------+--------------+------------------+
+ |service-type-id |service-type |resource-version |
+ +--------------------------------------+--------------+------------------+
+ |26ab7af6-96cc-4c4e-814a-e533af4ef9f6 |vTest |1504086172338 |
+ +--------------------------------------+--------------+------------------+
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-sample-1.1.yaml
new file mode 100644
index 00000000..b33cf597
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: subscription-create
+version: onap-1.1
+samples:
+ sample1:
+ name: Create a subscription
+ input: -h https://locahost:8443 -u AAI -p AAI -x customer-4 -y subscriber-4 -z abc-xyz -r ABCXYZ25 -c 8bcf4466-b092-473f-889b-7f40efb5a323 -e vTest
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-sample-1.1.yaml
new file mode 100644
index 00000000..3a040d7e
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: subscription-delete
+version: onap-1.1
+samples:
+ sample1:
+ name: Delete the subscription
+ input: -h https://locahost:8443 -u AAI -p AAI -x customer-4 -y vTest -g 1504258356743
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-sample-1.1.yaml
new file mode 100644
index 00000000..98880aad
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-sample-1.1.yaml
@@ -0,0 +1,25 @@
+onap_cli_sample_version: 1.0
+
+name: subscription-list
+version: onap-1.1
+samples:
+ sample1:
+ name: List the configured subscription in onap for a given customer
+ input: -h https://locahost:8443 -u AAI -p AAI -x customer-4
+ output: |
+ +--------------+------------------+
+ |service-type |resource-version |
+ +--------------+------------------+
+ |vTest |1504258356743 |
+ +--------------+------------------+
+
+
+ sample2:
+ name: List the configured subscription in onap for a given customer with complete details
+ input: -h https://locahost:8443 -u AAI -p AAI -x customer-4 --long
+ output: |
+ +--------------+------------------+--------------------------------------+----------+----------+
+ |service-type |resource-version |tenant |region |cloud |
+ +--------------+------------------+--------------------------------------+----------+----------+
+ |vTest |1505276255854 |3853ca3c-3bc3-4500-9ddf-08e8cca5493f |region-1 |cloud-1 |
+ +--------------+------------------+--------------------------------------+----------+----------+
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-create-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-create-sample-1.1.yaml
index 8a2da490..8a2da490 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-create-sample-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-create-sample-1.1.yaml
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-delete-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-delete-sample-1.1.yaml
index 44026ec3..44026ec3 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-delete-sample-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-delete-sample-1.1.yaml
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-list-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-list-sample-1.1.yaml
index 4348f6eb..4348f6eb 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-list-sample-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-list-sample-1.1.yaml
diff --git a/plugins/onap-1.1/features/msb/pom.xml b/plugins/onap-1.1/features/msb/pom.xml
new file mode 100644
index 00000000..c67ff7b2
--- /dev/null
+++ b/plugins/onap-1.1/features/msb/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2017 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.
+ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.onap.cli</groupId>
+ <artifactId>cli-plugins-onap-1.1-features</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>cli-plugins-onap-1.1-features-msb</artifactId>
+ <name>cli/plugins/onap-1.1/features/msb</name>
+ <packaging>jar</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceCreateCommand.java b/plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceCreateCommand.java
index 1ab3b97a..1ab3b97a 100644
--- a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceCreateCommand.java
+++ b/plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceCreateCommand.java
diff --git a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceDeleteCommand.java b/plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceDeleteCommand.java
index a7424fa0..a7424fa0 100644
--- a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceDeleteCommand.java
+++ b/plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceDeleteCommand.java
diff --git a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceListCommand.java b/plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceListCommand.java
index 221b4c0e..221b4c0e 100644
--- a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceListCommand.java
+++ b/plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceListCommand.java
diff --git a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceShowCommand.java b/plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceShowCommand.java
index 40cb5315..40cb5315 100644
--- a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceShowCommand.java
+++ b/plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceShowCommand.java
diff --git a/plugins/msb/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand b/plugins/onap-1.1/features/msb/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand
index 527abe0c..527abe0c 100644
--- a/plugins/msb/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand
+++ b/plugins/onap-1.1/features/msb/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand
diff --git a/plugins/msb/src/main/resources/open-cli-schema/microservice-create-schema.yaml b/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-create-schema.yaml
index 79afd2c7..79afd2c7 100644
--- a/plugins/msb/src/main/resources/open-cli-schema/microservice-create-schema.yaml
+++ b/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-create-schema.yaml
diff --git a/plugins/msb/src/main/resources/open-cli-schema/microservice-delete-schema.yaml b/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-delete-schema.yaml
index 82eabf95..82eabf95 100644
--- a/plugins/msb/src/main/resources/open-cli-schema/microservice-delete-schema.yaml
+++ b/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-delete-schema.yaml
diff --git a/plugins/msb/src/main/resources/open-cli-schema/microservice-list-schema.yaml b/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-list-schema.yaml
index 52014c9b..52014c9b 100644
--- a/plugins/msb/src/main/resources/open-cli-schema/microservice-list-schema.yaml
+++ b/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-list-schema.yaml
diff --git a/plugins/msb/src/main/resources/open-cli-schema/microservice-show-schema.yaml b/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-show-schema.yaml
index a9e1cced..a9e1cced 100644
--- a/plugins/msb/src/main/resources/open-cli-schema/microservice-show-schema.yaml
+++ b/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-show-schema.yaml
diff --git a/plugins/msb/src/test/resources/onap-cli-sample/msb-create-service-sample-1.1.yaml b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-create-service-sample-1.1.yaml
index d316f388..d316f388 100644
--- a/plugins/msb/src/test/resources/onap-cli-sample/msb-create-service-sample-1.1.yaml
+++ b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-create-service-sample-1.1.yaml
diff --git a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-delete-service-sample-1.1.yaml b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-delete-service-sample-1.1.yaml
new file mode 100644
index 00000000..2aaadb22
--- /dev/null
+++ b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-delete-service-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: microservice-delete
+version: onap-1.1
+samples:
+ sample1:
+ name: Delete a service
+ input: --service-name test-service --service-version v1 --host-url http://192.168.17.23:80 --node-ip 23.14.15.156 --node-port 80 \ No newline at end of file
diff --git a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-list-service-sample-1.1.yaml b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-list-service-sample-1.1.yaml
new file mode 100644
index 00000000..178a9c85
--- /dev/null
+++ b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-list-service-sample-1.1.yaml
@@ -0,0 +1,14 @@
+onap_cli_sample_version: 1.0
+
+name: microservice-list
+version: onap-1.1
+samples:
+ sample1:
+ name: List a service
+ input: --host-url http://192.168.17.23:80
+ output: |
+ +--------------+----------+------------------------------------+--------+------------------+
+ |name |version |url |status |nodes |
+ +--------------+----------+------------------------------------+--------+------------------+
+ |test-service |v1 |/C:/Program Files/Git/api/test/v1 |1 |23.14.15.156:80 |
+ +--------------+----------+------------------------------------+--------+------------------+ \ No newline at end of file
diff --git a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-show-service-sample-1.1.yaml b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-show-service-sample-1.1.yaml
new file mode 100644
index 00000000..abf1f110
--- /dev/null
+++ b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-show-service-sample-1.1.yaml
@@ -0,0 +1,14 @@
+onap_cli_sample_version: 1.0
+
+name: microservice-show
+version: onap-1.1
+samples:
+ sample1:
+ name: Show a service
+ input: --service-name test-service --service-version v1 --host-url http://192.168.17.23:80
+ output: |
+ +--------------+----------+------------------------------------+--------+------------------+
+ |name |version |url |status |nodes |
+ +--------------+----------+------------------------------------+--------+------------------+
+ |test-service |v1 |/C:/Program Files/Git/api/test/v1 |1 |23.14.15.156:80 |
+ +--------------+----------+------------------------------------+--------+------------------+ \ No newline at end of file
diff --git a/plugins/onap-1.1/features/pom.xml b/plugins/onap-1.1/features/pom.xml
new file mode 100644
index 00000000..ded980d6
--- /dev/null
+++ b/plugins/onap-1.1/features/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2017 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.
+ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.onap.cli</groupId>
+ <artifactId>cli-plugins-onap-1.1</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>cli-plugins-onap-1.1-features</artifactId>
+ <name>cli/plugins/onap-1.1/features</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>msb</module>
+ <module>aai</module>
+ <module>sdc</module>
+ <module>so</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-artifact</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <type>${project.packaging}</type>
+ </artifactItem>
+ </artifactItems>
+ <!-- copy to plugin dependencies -->
+ <outputDirectory>../../../../plugins/target/lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
diff --git a/plugins/onap-1.1/features/sdc/pom.xml b/plugins/onap-1.1/features/sdc/pom.xml
new file mode 100644
index 00000000..abd24800
--- /dev/null
+++ b/plugins/onap-1.1/features/sdc/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.onap.cli</groupId>
+ <artifactId>cli-plugins-onap-1.1-features</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>cli-plugins-onap-1.1-features-sdc</artifactId>
+ <name>cli/plugins/onap-1.1/features/sdc</name>
+ <packaging>jar</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml
new file mode 100644
index 00000000..a6b844cb
--- /dev/null
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml
@@ -0,0 +1,41 @@
+open_cli_schema_version: 1.0
+name: license-model-create
+description: Create License Model
+version: onap-1.1
+service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
+
+parameters:
+ - name: vendor-name
+ description: vendor name
+ type: string
+ short_option: x
+ long_option: vendor-name
+ is_optional: false
+ - name: license-model-description
+ description: Description for License Model
+ type: string
+ short_option: y
+ long_option: license-model-description
+ is_optional: true
+results:
+ direction: portrait
+ attributes:
+ - name: ID
+ description: License Model ID
+ scope: short
+ type: string
+http:
+ request:
+ uri: /onboarding-api/v1.0/vendor-license-models
+ method: POST
+ body: '{"vendorName": "${vendor-name}", "description": "${license-model-description}", "iconRef": "icon"}'
+ success_codes:
+ - 200
+ result_map:
+ ID: $b{$.value}
+ sample_response:
+ body: '{"value":"2DEB6CB4B082415BB7A697C9CD1273BA"}'
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-show-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-show-schema.yaml
new file mode 100644
index 00000000..c0ae3e07
--- /dev/null
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-show-schema.yaml
@@ -0,0 +1,50 @@
+open_cli_schema_version: 1.0
+name: license-model-show
+description: Details of the License Model
+version: onap-1.1
+service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
+
+parameters:
+ - name: license-model-id
+ description: Onap License Model ID
+ type: string
+ short_option: x
+ long_option: license-model-id
+ is_optional: false
+
+results:
+ direction: landscape
+ attributes:
+ - name: name
+ description: License Model Name
+ scope: short
+ type: string
+ - name: ID
+ description: License Model ID
+ scope: short
+ type: string
+ - name: description
+ description: Description for the License Model
+ scope: short
+ type: string
+ - name: status
+ description: Status of the License Model
+ scope: short
+ type: string
+http:
+ request:
+ uri: /onboarding-api/v1.0/vendor-software-products/${license-model-id}
+ method: GET
+ success_codes:
+ - 200
+ result_map:
+ name: $b{$.vendorName}
+ ID: $b{$.id}
+ description: $b{$.description}
+ status: $b{$.status}
+ sample_response:
+ body: '{"vendorName": "5aa8a88c","description": "vendor license model","iconRef": "icon","id": "109F0F948B974D998D89893A1BD39D4A","version": "0.1","status": "Locked","lockingUser": "cs0008","viewableVersions": ["0.1"]}'
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml
new file mode 100644
index 00000000..ce6aef09
--- /dev/null
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml
@@ -0,0 +1,27 @@
+open_cli_schema_version: 1.0
+name: vsp-checkin
+description: Checkin Vendor Software Product
+version: onap-1.1
+service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
+
+parameters:
+ - name: vsp-id
+ description: Onap VSP ID
+ type: string
+ short_option: x
+ long_option: vsp-id
+ is_optional: false
+http:
+ request:
+ uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/actions
+ method: PUT
+ body: '{"action": "Checkin"}'
+ success_codes:
+ - 201
+ - 200
+ sample_response:
+ body: ''
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml
new file mode 100644
index 00000000..d790ce55
--- /dev/null
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml
@@ -0,0 +1,28 @@
+open_cli_schema_version: 1.0
+name: vsp-checkout
+description: Checkout Vendor Software Product
+version: onap-1.1
+
+service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
+
+parameters:
+ - name: vsp-id
+ description: Onap VSP ID
+ type: string
+ short_option: x
+ long_option: vsp-id
+ is_optional: false
+http:
+ request:
+ uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/actions
+ method: PUT
+ body: '{"action": "Checkout"}'
+ success_codes:
+ - 201
+ - 200
+ sample_response:
+ body: ''
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml
new file mode 100644
index 00000000..4b3da1d0
--- /dev/null
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml
@@ -0,0 +1,79 @@
+open_cli_schema_version: 1.0
+name: vsp-create
+description: Create Vendor Software Product
+version: onap-1.1
+service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
+
+parameters:
+ - name: vsp-name
+ description: Onap VSP Name
+ type: string
+ short_option: x
+ long_option: vsp-name
+ is_optional: false
+ - name: vsp-description
+ description: Description for VSP
+ type: string
+ short_option: y
+ long_option: vsp-description
+ is_optional: true
+ - name: vsp-category
+ description: Category of the VSP
+ type: string
+ long_option: vsp-category
+ is_optional: true
+ default_value: resourceNewCategory.generic
+ - name: vsp-subcategory
+ description: Sub Category of VSP
+ type: string
+ long_option: vsp-subcategory
+ is_optional: true
+ default_value: resourceNewCategory.generic.abstract
+ - name: vsp-license-version
+ description: License version
+ type: string
+ long_option: vsp-license-version
+ is_optional: true
+ default_value: 1.0
+ - name: vsp-vendor-name
+ description: License Model Name
+ type: string
+ long_option: vsp-vendor-name
+ is_optional: false
+ - name: vsp-vendor-id
+ description: License Model ID
+ type: string
+ long_option: vsp-vendor-id
+ is_optional: false
+ - name: license-agreement-id
+ description: License Agreement ID
+ type: string
+ long_option: license-agreement-id
+ is_optional: false
+ - name: feature-group-id
+ description: Feature Group ID
+ type: string
+ long_option: feature-group-id
+ is_optional: false
+results:
+ direction: portrait
+ attributes:
+ - name: ID
+ description: VSP ID
+ scope: short
+ type: string
+http:
+ request:
+ uri: /onboarding-api/v1.0/vendor-software-products
+ method: POST
+ body: '{"name": "${vsp-name}", "description": "${vsp-description}", "category": "${vsp-category}", "subCategory": "${vsp-subcategory}", "licensingVersion": "${vsp-license-version}", "vendorName": "${vsp-vendor-name}", "vendorId": "${vsp-vendor-id}", "icon": "icon", "licensingData": { "licenseAgreement": "${license-agreement-id}", "featureGroups": [ "${feature-group-id}" ]}}'
+ success_codes:
+ - 200
+ result_map:
+ ID: $b{$.vspId}
+ sample_response:
+ body: '{"vspId":"2DEB6CB4B082415BB7A697C9CD1273BA"}'
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml
new file mode 100644
index 00000000..24212102
--- /dev/null
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml
@@ -0,0 +1,32 @@
+open_cli_schema_version: 1.0
+name: vsp-list
+description: List of the Vendor Software Products
+version: onap-1.1
+service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
+
+results:
+ direction: landscape
+ attributes:
+ - name: ID
+ description: VSP ID
+ scope: short
+ type: string
+ - name: name
+ description: VSP Name
+ scope: short
+ type: string
+http:
+ request:
+ uri: /onboarding-api/v1.0/vendor-software-products
+ method: GET
+ success_codes:
+ - 200
+ result_map:
+ name: $b{results.[*].name}
+ ID: $b{results.[*].id}
+ sample_response:
+ body: '{"results":[{"name":"test-vsp1","description":"vendor software product","category":"resourceNewCategory.generic","subCategory":"resourceNewCategory.generic.abstract","vendorName":"5aa8a88c","vendorId":"DBB202617952486691C1E35C9621CD4E","licensingVersion":"1.0","licensingData":{"licenseAgreement":"E19DBDDB137B494385F9535325BFD585","featureGroups":["94835F096DAF4ED78781A394A4F22AD1"]},"id":"354BF3E32E494EAFBB15037CFAB262FF","version":"0.1","viewableVersions":["0.1"],"status":"Locked","lockingUser":"cs0008"},{"name":"test-vsp","description":"vendor software product","category":"resourceNewCategory.generic","subCategory":"resourceNewCategory.generic.abstract","vendorName":"5aa8a88c","vendorId":"DBB202617952486691C1E35C9621CD4E","licensingVersion":"1.0","licensingData":{"licenseAgreement":"E19DBDDB137B494385F9535325BFD585","featureGroups":["94835F096DAF4ED78781A394A4F22AD1"]},"id":"2DEB6CB4B082415BB7A697C9CD1273BA","version":"1.0","viewableVersions":["1.0"],"finalVersions":["1.0"],"status":"Final"}],"listCount":2}'
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml
new file mode 100644
index 00000000..bb3cde39
--- /dev/null
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml
@@ -0,0 +1,45 @@
+open_cli_schema_version: 1.0
+name: vsp-show
+description: Details of the Vendor Software Product
+version: onap-1.1
+service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
+
+parameters:
+ - name: vsp-id
+ description: Onap VSP ID
+ type: string
+ short_option: x
+ long_option: vsp-id
+ is_optional: false
+
+results:
+ direction: landscape
+ attributes:
+ - name: name
+ description: VSP Name
+ scope: short
+ type: string
+ - name: ID
+ description: VSP ID
+ scope: short
+ type: string
+ - name: description
+ description: Description for the VSP
+ scope: short
+ type: string
+http:
+ request:
+ uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}
+ method: GET
+ success_codes:
+ - 200
+ result_map:
+ name: $b{$.name}
+ ID: $b{$.id}
+ description: $b{$.description}
+ sample_response:
+ body: '{"name":"test-vsp1","description":"vendor software product","category":"resourceNewCategory.generic","subCategory":"resourceNewCategory.generic.abstract","vendorName":"5aa8a88c","vendorId":"DBB202617952486691C1E35C9621CD4E","licensingVersion":"1.0","licensingData":{"licenseAgreement":"E19DBDDB137B494385F9535325BFD585","featureGroups":["94835F096DAF4ED78781A394A4F22AD1"]},"id":"354BF3E32E494EAFBB15037CFAB262FF","version":"0.1","viewableVersions":["0.1"],"status":"Locked","lockingUser":"cs0008"}'
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml
new file mode 100644
index 00000000..13170725
--- /dev/null
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml
@@ -0,0 +1,27 @@
+open_cli_schema_version: 1.0
+name: vsp-submit
+description: Submit Vendor Software Product
+version: onap-1.1
+service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
+
+parameters:
+ - name: vsp-id
+ description: Onap VSP ID
+ type: string
+ short_option: x
+ long_option: vsp-id
+ is_optional: false
+http:
+ request:
+ uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/actions
+ method: PUT
+ body: '{"action": "Submit"}'
+ success_codes:
+ - 201
+ - 200
+ sample_response:
+ body: ''
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml
new file mode 100644
index 00000000..c868d3d7
--- /dev/null
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml
@@ -0,0 +1,33 @@
+open_cli_schema_version: 1.0
+name: vsp-upload
+description: Upload the CSAR file to VSP
+version: onap-1.1
+service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
+
+parameters:
+ - name: vsp-id
+ description: Onap VSP ID
+ type: string
+ short_option: x
+ long_option: vsp-id
+ is_optional: false
+ - name: vsp-file
+ description: CSAR File path
+ type: binary
+ short_option: y
+ long_option: vsp-file
+ is_optional: false
+http:
+ request:
+ uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/upload
+ method: POST
+ body: ${vsp-file}
+ multipart_entity_name: upload
+ success_codes:
+ - 200
+ sample_response:
+ body: ''
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml
new file mode 100644
index 00000000..6fb545ef
--- /dev/null
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: vsp-checkin
+version: onap-1.1
+samples:
+ sample1:
+ name: Checkin the Vendor Software Product
+ input: --host-username cs0008 --host-password demo123456! --host-url http://localhost:8080 --vsp-id E563CB23A6BE49AF9A84CF579DAFB929
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml
new file mode 100644
index 00000000..d7a9e375
--- /dev/null
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml
@@ -0,0 +1,9 @@
+onap_cli_sample_version: 1.0
+
+name: vsp-checkout
+version: onap-1.1
+
+samples:
+ sample1:
+ name: Checkout the Vendor Software Product
+ input: --host-username cs0008 --host-password demo123456! --host-url http://localhost:8080 --vsp-id E563CB23A6BE49AF9A84CF579DAFB929
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml
new file mode 100644
index 00000000..fa5b0a61
--- /dev/null
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml
@@ -0,0 +1,14 @@
+onap_cli_sample_version: 1.0
+
+name: vsp-create
+version: onap-1.1
+samples:
+ sample1:
+ name: Create the Vendor Software Product
+ input: --host-username cs0008 --host-password demo123456! --host-url http://locahost:8080 --vsp-name demo-vsp2 --vsp-vendor-name 5aa8a88c --vsp-vendor-id DBB202617952486691C1E35C9 621CD4E --license-agreement-id E19DBDDB137B494385F9535325BFD585 --feature-group-id 94835F096DAF4ED78781A394A4F22AD1
+ output: |
+ +----------+----------------------------------+
+ |property |value |
+ +----------+----------------------------------+
+ |ID |6897DFFF8E864F84AD17A34B7FB936A3 |
+ +----------+----------------------------------+
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml
new file mode 100644
index 00000000..aeab1694
--- /dev/null
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml
@@ -0,0 +1,18 @@
+onap_cli_sample_version: 1.0
+
+name: vsp-list
+version: onap-1.1
+samples:
+ sample1:
+ name: List Vendor Software Products
+ input: --host-username cs0008 --host-password demo123456! --host-url http://localhost:8080
+ output: |
+ +----------------------------------+------------+
+ |ID |name |
+ +----------------------------------+------------+
+ |E563CB23A6BE49AF9A84CF579DAFB929 |demo-vsp2 |
+ +----------------------------------+------------+
+ |79E62AA736C34E359B869E757D3DDBBE |demo-vsp1 |
+ +----------------------------------+------------+
+ |928B828EE3CC46B99B92D7B9A2AB2118 |demo-vsp |
+ +----------------------------------+------------+
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml
new file mode 100644
index 00000000..fd2f132f
--- /dev/null
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml
@@ -0,0 +1,14 @@
+onap_cli_sample_version: 1.0
+
+name: vsp-show
+version: onap-1.1
+samples:
+ sample1:
+ name: Show the details of Vendor Software Products
+ input: --host-username cs0008 --host-password demo123456! --host-url http://localhost:8080 --vsp-id 2DEB6CB4B082415BB7A697C9CD1273BA
+ output: |
+ +----------+----------------------------------+--------------------------+
+ |name |ID |description |
+ +----------+----------------------------------+--------------------------+
+ |test-vsp |2DEB6CB4B082415BB7A697C9CD1273BA |vendor software product |
+ +----------+----------------------------------+--------------------------+
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml
new file mode 100644
index 00000000..0a157c11
--- /dev/null
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: vsp-submit
+version: onap-1.1
+samples:
+ sample1:
+ name: Submit the Vendor Software Product
+ input: --host-username cs0008 --host-password demo123456! --host-url http://localhost:8080 --vsp-id E563CB23A6BE49AF9A84CF579DAFB929
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml
new file mode 100644
index 00000000..5c5263fd
--- /dev/null
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: vsp-upload
+version: onap-1.1
+samples:
+ sample1:
+ name: upload the zip file to Vendor Software Product
+ input: --host-username cs0008 --host-password demo123456! --host-url http://localhost:8080 --vsp-id E563CB23A6BE49AF9A84CF579DAFB929 --vsp-file /home/user/vFW.zip
diff --git a/plugins/onap-1.1/features/so/pom.xml b/plugins/onap-1.1/features/so/pom.xml
new file mode 100644
index 00000000..c801f18d
--- /dev/null
+++ b/plugins/onap-1.1/features/so/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2017 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.
+ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.onap.cli</groupId>
+ <artifactId>cli-plugins-onap-1.1-features</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>cli-plugins-onap-1.1-features-so</artifactId>
+ <name>cli/plugins/onap-1.1/features/so</name>
+ <packaging>jar</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/plugins/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml
index 96b7e036..96b7e036 100644
--- a/plugins/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml
diff --git a/plugins/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml
index 7ae110ed..7ae110ed 100644
--- a/plugins/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml
diff --git a/plugins/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml
index 170ba845..170ba845 100644
--- a/plugins/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml
diff --git a/plugins/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml
index 37754087..37754087 100644
--- a/plugins/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml
diff --git a/plugins/so/src/main/resources/open-cli-schema/services/vnf-create-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-create-schema-1.1.yaml
index 899be1bb..899be1bb 100644
--- a/plugins/so/src/main/resources/open-cli-schema/services/vnf-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-create-schema-1.1.yaml
diff --git a/plugins/so/src/main/resources/open-cli-schema/services/vnf-delete-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-delete-schema-1.1.yaml
index 08134f88..08134f88 100644
--- a/plugins/so/src/main/resources/open-cli-schema/services/vnf-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-delete-schema-1.1.yaml
diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-sample-1.1.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-sample-1.1.yaml
new file mode 100644
index 00000000..c52d8000
--- /dev/null
+++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: service-create
+version: onap-1.1
+samples:
+ sample1:
+ name: Create a service instance
+ input: -h https://locahost:8080 -u InfraPortalClient -p password1$ -c customer -s subscriber -i instance -r \ No newline at end of file
diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-delete-sample-1.1.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-delete-sample-1.1.yaml
new file mode 100644
index 00000000..cc114ac0
--- /dev/null
+++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-delete-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: service-delete
+version: onap-1.1
+samples:
+ sample1:
+ name: delete a service instance
+ input: -h https://locahost:8080 -u InfraPortalClient -p password1$ -s 56AA445 \ No newline at end of file
diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-create-sample-1.1.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-create-sample-1.1.yaml
new file mode 100644
index 00000000..b19bc54d
--- /dev/null
+++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-create-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: vf-module-create
+version: onap-1.1
+samples:
+ sample1:
+ name: Create a vnf
+ input: -h https://locahost:8080 -u InfraPortalClient -p password1$ -l region1 -t 123ABC -v b123-45565678da -s a445678-24da -m a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb -r -i instance \ No newline at end of file
diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-delete-sample-1.1.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-delete-sample-1.1.yaml
new file mode 100644
index 00000000..780e69d4
--- /dev/null
+++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-delete-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: vf-module-delete
+version: onap-1.1
+samples:
+ sample1:
+ name: delete a vf module
+ input: -h https://locahost:8080 -u InfraPortalClient -p password1$ -s aca51b0a-710d-4155-bc7c-7cef19d9a94e -v aca45a67123-710d-4155-bc7c-7cef19d9a94e -m ccb52b09-710d-4155-bc7c-7cef19d9a94e -l mdt1 -t 88a6ca3ee0394ade9403f075db23167e \ No newline at end of file
diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-create-sample-1.1.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-create-sample-1.1.yaml
new file mode 100644
index 00000000..267d3b9c
--- /dev/null
+++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-create-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: vnf-create
+version: onap-1.1
+samples:
+ sample1:
+ name: Create a vnf
+ input: -h https://locahost:8080 -u InfraPortalClient -p password1$ -l region1 -t 123ABC -p a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb -i instance -r -s a445678da -m serviceA \ No newline at end of file
diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-delete-sample-1.1.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-delete-sample-1.1.yaml
new file mode 100644
index 00000000..bc3e89fb
--- /dev/null
+++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-delete-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: vnf-delete
+version: onap-1.1
+samples:
+ sample1:
+ name: delete a vnf
+ input: -h https://locahost:8080 -u InfraPortalClient -p password1$ -v aca51b0a-710d-4155-bc7c-7cef19d9a94e -s ff305d54-75b4-431b-adb2-eb6b9e5ff000 -l mdt1 -t 88a6ca3ee0394ade9403f075db23167e \ No newline at end of file
diff --git a/plugins/onap-1.1/pom.xml b/plugins/onap-1.1/pom.xml
new file mode 100644
index 00000000..3b5dcaf0
--- /dev/null
+++ b/plugins/onap-1.1/pom.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2017 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.
+ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.onap.cli</groupId>
+ <artifactId>cli-plugins</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>cli-plugins-onap-1.1</artifactId>
+ <name>cli/plugins/onap-1.1</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>auth</module>
+ <module>catalog</module>
+ <module>features</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-artifact</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <type>${project.packaging}</type>
+ </artifactItem>
+ </artifactItems>
+ <!-- copy to plugin dependencies -->
+ <outputDirectory>../../../plugins/target/lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 0fcc200a..a2972d1d 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -30,7 +30,7 @@
<artifactId>cli-plugins</artifactId>
<name>cli/plugins</name>
<packaging>pom</packaging>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -44,12 +44,8 @@
</dependency>
</dependencies>
<modules>
- <module>auth</module>
- <module>catalog</module>
- <module>msb</module>
- <module>aai</module>
- <module>sdc</module>
- <module>so</module>
+ <module>onap-1.0</module>
+ <module>onap-1.1</module>
<module>sample</module>
</modules>
<build>
@@ -84,3 +80,4 @@
</pluginManagement>
</build>
</project>
+
diff --git a/plugins/so/pom.xml b/plugins/so/pom.xml
deleted file mode 100644
index 2318f398..00000000
--- a/plugins/so/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2017 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.
- 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.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.onap.cli</groupId>
- <artifactId>cli-plugins</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>cli-plugins-so</artifactId>
- <name>cli/plugins/so</name>
- <packaging>jar</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project>