From a352350baa50f17ead5b5d43919a68a1877a1deb Mon Sep 17 00:00:00 2001 From: Kanagaraj M Date: Fri, 2 Aug 2019 12:32:27 +0530 Subject: clean-up stale onap profiles Issue-ID: CLI-169 Change-Id: I4f8fed2168037f776a70b1fa21ad5873d11afb68 Signed-off-by: Kanagaraj Manickam k00365106 --- .../main/release/data/onap-beijing-profile.json | 52 -------------------- .../main/release/data/onap-casablanca-profile.json | 57 ---------------------- 2 files changed, 109 deletions(-) delete mode 100644 deployment/zip/src/main/release/data/onap-beijing-profile.json delete mode 100644 deployment/zip/src/main/release/data/onap-casablanca-profile.json (limited to 'deployment/zip/src/main') diff --git a/deployment/zip/src/main/release/data/onap-beijing-profile.json b/deployment/zip/src/main/release/data/onap-beijing-profile.json deleted file mode 100644 index 5cd58c4c..00000000 --- a/deployment/zip/src/main/release/data/onap-beijing-profile.json +++ /dev/null @@ -1,52 +0,0 @@ -[ - { - "product" : "onap-beijing", - "name" : "aai:host-url", - "value" : "https://192.168.17.35:30233" - }, - { - "product" : "onap-beijing", - "name" : "aai:host-username", - "value" : "AAI" - }, - { - "product" : "onap-beijing", - "name" : "aai:host-password", - "value" : "AAI" - }, - { - "product" : "onap-beijing", - "name" : "msb:host-url", - "value" : "http://192.168.17.35:30081" - }, - { - "product" : "onap-beijing", - "name" : "sdc:host-url", - "value" : "http://192.168.17.35:30206" - }, - { - "product" : "onap-beijing", - "name" : "sdc:host-username", - "value" : "cs_0008" - }, - { - "product" : "onap-beijing", - "name" : "sdc:host-password", - "value" : "demo123456!" - }, - { - "product" : "onap-beijing", - "name" : "so:host-url", - "value" : "http://192.168.17.35:30223" - }, - { - "product" : "onap-beijing", - "name" : "so:host-username", - "value" : "InfraPortalClien" - }, - { - "product" : "onap-beijing", - "name" : "so:host-password", - "value" : "password1$" - } -] \ No newline at end of file diff --git a/deployment/zip/src/main/release/data/onap-casablanca-profile.json b/deployment/zip/src/main/release/data/onap-casablanca-profile.json deleted file mode 100644 index 36c4a5a9..00000000 --- a/deployment/zip/src/main/release/data/onap-casablanca-profile.json +++ /dev/null @@ -1,57 +0,0 @@ -[ - { - "product" : "onap-casablanca", - "name" : "aai:host-url", - "value" : "https://192.168.17.7:8443" - }, - { - "product" : "onap-casablanca", - "name" : "aai:host-username", - "value" : "AAI" - }, - { - "product" : "onap-casablanca", - "name" : "aai:host-password", - "value" : "AAI" - }, - { - "product" : "onap-casablanca", - "name" : "msb:host-url", - "value" : "http://192.168.17.5:80" - }, - { - "product" : "onap-casablanca", - "name" : "sdc:host-url", - "value" : "http://192.168.17.13:8080" - }, - { - "product" : "onap-casablanca", - "name" : "sdc:host-username", - "value" : "cs_0008" - }, - { - "product" : "onap-casablanca", - "name" : "sdc:host-password", - "value" : "demo123456!" - }, - { - "product" : "onap-casablanca", - "name" : "policy:host-url", - "value" : "http://192.168.17.19:8443" - }, - { - "product" : "onap-casablanca", - "name" : "so:host-url", - "value" : "http://192.168.17.3:8080" - }, - { - "product" : "onap-casablanca", - "name" : "so:host-username", - "value" : "InfraPortalClien" - }, - { - "product" : "onap-casablanca", - "name" : "so:host-password", - "value" : "password1$" - } -] \ No newline at end of file -- cgit 1.2.3-korg From 0f9eadcf15651b6b73018200c41865422b7a2860 Mon Sep 17 00:00:00 2001 From: Kanagaraj M Date: Fri, 2 Aug 2019 13:50:11 +0530 Subject: Update open-cli.properties Issue-ID: CLI-169 Change-Id: I243858b5553ec52e8f4f0bafbcc727d4efaf1219 Signed-off-by: Kanagaraj Manickam k00365106 --- deployment/zip/src/main/release/conf/open-cli.properties | 13 ++++++++----- framework/src/main/resources/open-cli.properties | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) (limited to 'deployment/zip/src/main') diff --git a/deployment/zip/src/main/release/conf/open-cli.properties b/deployment/zip/src/main/release/conf/open-cli.properties index eca284ad..65d4db7e 100644 --- a/deployment/zip/src/main/release/conf/open-cli.properties +++ b/deployment/zip/src/main/release/conf/open-cli.properties @@ -13,10 +13,13 @@ # limitations under the License. cli.product_name=open-cli -cli.version=2.0.5 +cli.version=3.0.0 cli.discover_always=false -cli.data.dir=/opt/oclip/data -cli.artifact.dir=/opt/oclip/artifacts +cli.data.dir=$s{env:OPEN_CLI_HOME}/data +cli.artifact.dir=$s{env:OPEN_CLI_HOME}/data/artifacts +cli.tmp.dir=$s{env:OPEN_CLI_HOME}/data/tmp +#timeout in seconds +cli.grpc.client.timeout=60 #schema validation cli.schema.base.sections=open_cli_schema_version,name,description,parameters,results,info @@ -31,12 +34,12 @@ cli.schema.base.parameters.sections.mandatory=name,description,type cli.schema.base.results.sections=name,description,scope,type,is_secured, default_value cli.schema.base.results.sections.mandatory=name, description, type, scope -cli.schema.boolean_values=true,false +cli.schema.boolean_values=true cli.schema.command.type=cmd,auth,catalog # moco properties cli.sample.gen.enable=false -cli.sample.gen.target=. +cli.sample.gen.target=$s{env:OPEN_CLI_HOME}/open-cli-sample # mrkanag Move this to db, once exteranl command registration is supported in place of discovery cli.schema.profile.available=http,snmp,cmd diff --git a/framework/src/main/resources/open-cli.properties b/framework/src/main/resources/open-cli.properties index e0ca44a8..259fd227 100644 --- a/framework/src/main/resources/open-cli.properties +++ b/framework/src/main/resources/open-cli.properties @@ -13,10 +13,13 @@ # limitations under the License. cli.product_name=open-cli -cli.version=2.0.5 +cli.version=3.0.0 cli.discover_always=false -cli.data.dir=data -cli.artifact.dir=d:/temp/OCLIP +cli.data.dir=./data +cli.artifact.dir=./data/artifacts +cli.tmp.dir=./data/tmp +#timeout in seconds +cli.grpc.client.timeout=60 #schema validation cli.schema.base.sections=open_cli_schema_version,name,description,parameters,results,info @@ -36,10 +39,10 @@ cli.schema.command.type=cmd,auth,catalog # moco properties cli.sample.gen.enable=false -cli.sample.gen.target=. +cli.sample.gen.target=./open-cli-sample # mrkanag Move this to db, once exteranl command registration is supported in place of discovery -cli.schema.profile.available= +cli.schema.profile.available=http,snmp,cmd #other properties to load (it should be hanled when plugins are made as externally register-able #when command plugin management support is enabled in oclip -- cgit 1.2.3-korg