diff options
Diffstat (limited to 'deployment/zip')
4 files changed, 24 insertions, 119 deletions
diff --git a/deployment/zip/pom.xml b/deployment/zip/pom.xml index 454e259e..6af31ca3 100644 --- a/deployment/zip/pom.xml +++ b/deployment/zip/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli-deployment</artifactId> - <version>3.0.0</version> + <version>4.0.0-SNAPSHOT</version> </parent> <artifactId>cli-zip</artifactId> @@ -71,6 +71,12 @@ ant.delete(dir: "${deployUnzip}/data") ant.mkdir(dir: "${deployUnzip}/data") + ant.delete(dir: "${deployUnzip}/data/tmp") + ant.mkdir(dir: "${deployUnzip}/data/tmp") + + ant.delete(dir: "${deployUnzip}/script") + ant.mkdir(dir: "${deployUnzip}/script") + ant.copy(todir: "${deployUnzip}") { fileset(dir: "${basedir}/src/main/release"){ exclude(name: "**/.gitignore") @@ -96,16 +102,21 @@ fileset(dir: "${project.build.directory}/../../../grpc/target/lib/") } + ant.copy(todir: "${deployUnzip}/conf") { + fileset(dir: + "${project.build.directory}/../../../products/target/conf/") + fileset(dir: + "${project.build.directory}/../../../profiles/target/conf/") fileset(file: - "${basedir}/src/main/release/conf/open-cli.properties") + "${basedir}/src/main/release/conf/*.properties") } ant.copy(todir: - "${deployUnzip}/conf") { - fileset(file: - "${basedir}/src/main/release/conf/log4j.properties") + "${deployUnzip}/script") { + fileset(dir: + "${project.build.directory}/../../../products/target/script/") } ant.copy(todir: 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/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 |