From 39f345954434553d10e0cea114e15e0521ec9471 Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Tue, 26 Sep 2017 10:04:10 +0530 Subject: Migrate onap-cli-schema into open-cli-schema Issue-Id: CLI-66 Change-Id: I719719194bc5f21f4316380e606ce1a58f0f046c Signed-off-by: Kanagaraj Manickam k00365106 --- deployment/docker/src/main/docker/Dockerfile | 8 ++-- deployment/http/lighttpd/lighttpd.conf | 2 +- deployment/http/web/index.html | 63 +++++++++++++++++++++++----- deployment/http/web/occ.html | 2 +- deployment/zip/installer/install.sh | 5 +-- deployment/zip/pom.xml | 8 ++-- deployment/zip/src/main/release/bin/onap.sh | 8 ++-- 7 files changed, 69 insertions(+), 27 deletions(-) (limited to 'deployment') diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile index 91ca317b..f3665223 100644 --- a/deployment/docker/src/main/docker/Dockerfile +++ b/deployment/docker/src/main/docker/Dockerfile @@ -10,7 +10,7 @@ RUN cd /tmp && curl -O https://storage.googleapis.com/golang/go1.9.linux-amd64.t mv /tmp/gotty/bin/gotty /usr/sbin/ #Environments -ENV ONAP_CLI_HOME /opt/onap/cli +ENV OPEN_CLI_HOME /opt/onap/cli ENV ONAP_CLI_DEBUG false ENV ONAP_CLI_DEBUG_PORT 5005 ENV CLI_MODE console @@ -21,8 +21,8 @@ ENV ONAP_USERNAME guest ENV ONAP_PASSWORD guest #Copy CLI into docker -ADD ./STAGE $ONAP_CLI_HOME -WORKDIR $ONAP_CLI_HOME +ADD ./STAGE $OPEN_CLI_HOME +WORKDIR $OPEN_CLI_HOME #Setup the run time environment (RTE) #RTE: CLI @@ -32,7 +32,7 @@ RUN chmod +x ./bin/onap.sh && \ if [ ! -d ./onap-cli-schema ]; then mkdir ./onap-cli-schema; fi #Create the readable README -RUN pandoc -t plain $ONAP_CLI_HOME/docs/README.md > $ONAP_CLI_HOME/docs/onap-readme.txt +RUN pandoc -t plain $OPEN_CLI_HOME/docs/README.md > $OPEN_CLI_HOME/docs/onap-readme.txt #RTE: lighttpd COPY ./STAGE/http/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf diff --git a/deployment/http/lighttpd/lighttpd.conf b/deployment/http/lighttpd/lighttpd.conf index 8f88a912..03765bf8 100644 --- a/deployment/http/lighttpd/lighttpd.conf +++ b/deployment/http/lighttpd/lighttpd.conf @@ -1,4 +1,4 @@ -server.document-root = "/var/www-data/servers/onap-cli/" +server.document-root = "/var/www-data/servers/open-cli/" server.username = "www-data" server.groupname = "www-data" server.port = 80 diff --git a/deployment/http/web/index.html b/deployment/http/web/index.html index f722b657..a8059671 100644 --- a/deployment/http/web/index.html +++ b/deployment/http/web/index.html @@ -1,12 +1,55 @@ - -ONAP CLI - - - - + +ONAP CLI +

ONAP Command-line interface (CLI)

One Command to command whole Onap !!

Provides unified commands to operate ONAP from Linux console and Web console.

+ +

To download

Please download ONAP CLI here

+ +

To install

Please follow the instructions given below for installing ONAP CLI.

Un-zip the above download file into /opt/onap/cli folder
Run the following commands: +
export ONAP_CLI_HOME=$CLI_INSTALL_DIR +
export CLI_PRODUCT_VERSION=onap-1.1 +
+
cd $CLI_INSTALL_DIR +
+
if [ ! -d ./data ]; then mkdir ./data; fi +
if [ ! -d ./onap-cli-schema ]; then mkdir ./onap-cli-schema; fi +
+
chmod +x ./bin/onap.sh +
+
#Make onap available in path +
ln ./bin/onap.sh $CLI_BIN +
+
#Print the version +
onap -v

+ +

Web Command console

To open Console, Click Web Command console

+ +

To Run a command

+ +

Configure the following environment variables, before using it in Linux console:

HOST_URL - Onap Micro service bus(MSB) URL or a service URL
HOST_USERNAME - Onap user name
HOST_PASSWORD - Onap user password

+ +

Type onap <command> from Linux console.

+ +

To Run in Interactive mode

Type onap from linux console

+ +

More details

https://wiki.onap.org

+ +

To download

Please download ONAP CLI here

diff --git a/deployment/http/web/occ.html b/deployment/http/web/occ.html index de2daee5..feb94b97 100644 --- a/deployment/http/web/occ.html +++ b/deployment/http/web/occ.html @@ -2,7 +2,7 @@ OCC - + diff --git a/deployment/zip/installer/install.sh b/deployment/zip/installer/install.sh index c5ec4216..177656a9 100644 --- a/deployment/zip/installer/install.sh +++ b/deployment/zip/installer/install.sh @@ -20,8 +20,7 @@ CLI_LATEST_BINARY="https://nexus.onap.org/service/local/artifact/maven/redirect? CLI_INSTALL_DIR=/opt/onap/cli CLI_ZIP=cli.zip CLI_BIN=/usr/bin/onap -export ONAP_CLI_HOME=$CLI_INSTALL_DIR -export CLI_PRODUCT_VERSION=onap-1.1 +export OPEN_CLI_HOME=$CLI_INSTALL_DIR #create install dir if [ -d $CLI_INSTALL_DIR ] @@ -47,7 +46,7 @@ wget -O $CLI_ZIP $CLI_LATEST_BINARY unzip $CLI_ZIP if [ ! -d ./data ]; then mkdir ./data; fi -if [ ! -d ./onap-cli-schema ]; then mkdir ./onap-cli-schema; fi +if [ ! -d ./open-cli-schema ]; then mkdir ./open-cli-schema; fi chmod +x ./bin/onap.sh #Make onap available in path diff --git a/deployment/zip/pom.xml b/deployment/zip/pom.xml index 05d015c6..9ad346cc 100644 --- a/deployment/zip/pom.xml +++ b/deployment/zip/pom.xml @@ -38,7 +38,7 @@ 1.5 - onap-cli-deployment + open-cli-deployment package execute @@ -62,8 +62,8 @@ ant.delete(dir: "${deployUnzip}/lib") ant.mkdir(dir: "${deployUnzip}/lib") - ant.delete(dir: "${deployUnzip}/onap-cli-schema") - ant.mkdir(dir: "${deployUnzip}/onap-cli-schema") + ant.delete(dir: "${deployUnzip}/open-cli-schema") + ant.mkdir(dir: "${deployUnzip}/open-cli-schema") ant.delete(dir: "${deployUnzip}/data") ant.mkdir(dir: "${deployUnzip}/data") @@ -93,7 +93,7 @@ ant.copy(todir: "${deployUnzip}/conf") { fileset(file: - "${project.build.directory}/../../../framework/src/main/resources/onap.properties") + "${project.build.directory}/../../../framework/src/main/resources/open-cli.properties") } ant.copy(todir: diff --git a/deployment/zip/src/main/release/bin/onap.sh b/deployment/zip/src/main/release/bin/onap.sh index c7d4142a..9349c143 100755 --- a/deployment/zip/src/main/release/bin/onap.sh +++ b/deployment/zip/src/main/release/bin/onap.sh @@ -16,14 +16,14 @@ # limitations under the License. #******************************************************************************* -if [ -z "$ONAP_CLI_HOME" ] +if [ -z "$OPEN_CLI_HOME" ] then - echo "There is no ONAP_CLI_HOME" + echo "There is no OPEN_CLI_HOME" exit 1 fi -CLASSPATH=$ONAP_CLI_HOME:$ONAP_CLI_HOME/conf:$ONAP_CLI_HOME/docs -for entry in "$ONAP_CLI_HOME/lib"/* +CLASSPATH=$OPEN_CLI_HOME:$OPEN_CLI_HOME/conf:$OPEN_CLI_HOME/docs +for entry in "$OPEN_CLI_HOME/lib"/* do CLASSPATH=$CLASSPATH:$entry done -- cgit 1.2.3-korg