diff options
Diffstat (limited to 'deployment')
| -rw-r--r-- | deployment/docker/src/main/docker/Dockerfile | 16 | ||||
| -rw-r--r-- | deployment/docker/src/main/docker/docker-compose.yaml | 8 | ||||
| -rw-r--r-- | deployment/http/web/index.html | 19 | ||||
| -rw-r--r-- | deployment/zip/pom.xml | 1 | ||||
| -rwxr-xr-x | deployment/zip/src/main/release/bin/onap.sh | 6 |
5 files changed, 32 insertions, 18 deletions
diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile index f3665223..57b78284 100644 --- a/deployment/docker/src/main/docker/Dockerfile +++ b/deployment/docker/src/main/docker/Dockerfile @@ -11,14 +11,14 @@ RUN cd /tmp && curl -O https://storage.googleapis.com/golang/go1.9.linux-amd64.t #Environments ENV OPEN_CLI_HOME /opt/onap/cli -ENV ONAP_CLI_DEBUG false -ENV ONAP_CLI_DEBUG_PORT 5005 -ENV CLI_MODE console -ENV CLI_PRODUCT_VERSION onap-1.1 +ENV OPEN_CLI_DEBUG false +ENV OPEN_CLI_DEBUG_PORT 5005 +ENV OPEN_CLI_MODE console +ENV OPEN_CLI_PRODUCT_VERSION open-cli ENV HOST_URL http://localhost:8080 -ENV ONAP_USERNAME guest -ENV ONAP_PASSWORD guest +ENV OPEN_USERNAME guest +ENV OPEN_PASSWORD guest #Copy CLI into docker ADD ./STAGE $OPEN_CLI_HOME @@ -49,9 +49,9 @@ EXPOSE 80 EXPOSE 8080 #Start -ENTRYPOINT if [ "$CLI_MODE" = "daemon" ]; then service lighttpd start; gotty --permit-write --reconnect onap; else onap -v && /bin/bash; fi +ENTRYPOINT if [ "$OPEN_CLI_MODE" = "daemon" ]; then service lighttpd start; gotty --permit-write --reconnect onap; else onap -v && /bin/bash; fi #Cleanup RUN apt-get purge -y pandoc && apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/go /tmp/gotty /tmp/* /var/tmp/* -RUN echo ONAP CLI docker successfully created !!
\ No newline at end of file +RUN echo ONAP CLI docker successfully created !! diff --git a/deployment/docker/src/main/docker/docker-compose.yaml b/deployment/docker/src/main/docker/docker-compose.yaml index f6273cb8..370ca678 100644 --- a/deployment/docker/src/main/docker/docker-compose.yaml +++ b/deployment/docker/src/main/docker/docker-compose.yaml @@ -4,7 +4,7 @@ services: occ: image: onap/cli environment: - CLI_MODE: 'daemon' + OPEN_CLI_MODE: 'daemon' expose: - 80 - 8080 @@ -17,15 +17,15 @@ services: tty: true image: onap/cli environment: - CLI_MODE: 'console' + OPEN_CLI_MODE: 'console' debug: stdin_open: true tty: true image: onap/cli environment: - CLI_MODE: 'console' - ONAP_CLI_DEBUG: "true" + OPEN_CLI_MODE: 'console' + OPEN_CLI_DEBUG: "true" expose: - 5005 ports: diff --git a/deployment/http/web/index.html b/deployment/http/web/index.html index a8059671..f8680f08 100644 --- a/deployment/http/web/index.html +++ b/deployment/http/web/index.html @@ -1,6 +1,6 @@ <!DOCTYPE html><html><head><link rel="icon" href="./open-cli.png"> <meta charset="utf-8"><title>ONAP CLI</title><style></style></head><body id="preview"> -<h1><a id="ONAP_Commandline_interface_CLI_0"></a>ONAP Command-line interface (CLI)</h1> +<h1><a id="OPEN_Commandline_interface_CLI_0"></a>ONAP Command-line interface (CLI)</h1> <p style="color:blue"><strong>One Command to command whole Onap !!</strong></p> <p>Provides unified commands to operate ONAP from Linux console and Web console.</p> @@ -45,7 +45,22 @@ <h2><a id="To_Run_in_Interactive_mode_16"></a>To Run in Interactive mode</h2> <p>Type <strong>onap</strong> from linux console</p> - +<h2><a id="Set_the_product_version_20"></a>Set the product version</h2> +<p>CLI framework is enhanced to handle multiple product versions at same<br> +time. so to choose the product version, set evironment variable<br> +<strong>CLI_PROUDCT_VERSION</strong>.</p> +<p>NOTE: In interactive mode, product version can be selected using<br> +typing <strong>use <product-version></strong></p> +<p>Run <em>onap [-v|–version]</em> to see the CLI and available product version details</p> +<h2><a id="Help_31"></a>Help</h2> +<p><em>onap [-h|–help]</em><br> +<em>onap <command> [-h|–help]</em></p> +<h2><a id="Debug_Mode_36"></a>Debug Mode</h2> +<p>To run in debug mode, set following environment variables:</p> +<ol> +<li>OPEN_CLI_DEBUG - By default its false, otherwise Set to true</li> +<li>OPEN_CLI_DEBUG_PORT - By default it is 5005, otherwise set to new TCP port number</li> +</ol> <h2><a id="More_details_42"></a>More details</h2> <p><a href="https://wiki.onap.org">https://wiki.onap.org</a></p> diff --git a/deployment/zip/pom.xml b/deployment/zip/pom.xml index 9ad346cc..e8cfa24b 100644 --- a/deployment/zip/pom.xml +++ b/deployment/zip/pom.xml @@ -89,7 +89,6 @@ fileset(dir: "${project.build.directory}/../../../plugins/target/lib/") } - ant.copy(todir: "${deployUnzip}/conf") { fileset(file: diff --git a/deployment/zip/src/main/release/bin/onap.sh b/deployment/zip/src/main/release/bin/onap.sh index 9349c143..e4a58502 100755 --- a/deployment/zip/src/main/release/bin/onap.sh +++ b/deployment/zip/src/main/release/bin/onap.sh @@ -28,9 +28,9 @@ do CLASSPATH=$CLASSPATH:$entry done -if [ "$ONAP_CLI_DEBUG" = "true" ] +if [ "$OPEN_CLI_DEBUG" = "true" ] then - java -Xdebug -Xrunjdwp:transport=dt_socket,address=${ONAP_CLI_DEBUG_PORT:-5005},server=y -classpath $CLASSPATH -DONAP_CLI_HOME=$ONAP_CLI_HOME org.onap.cli.main.OnapCli "$@" + java -Xdebug -Xrunjdwp:transport=dt_socket,address=${OPEN_CLI_DEBUG_PORT:-5005},server=y -classpath $CLASSPATH -DOPEN_CLI_HOME=$OPEN_CLI_HOME org.onap.cli.main.OnapCli "$@" else - java -classpath $CLASSPATH -DONAP_CLI_HOME=$ONAP_CLI_HOME org.onap.cli.main.OnapCli "$@" + java -classpath $CLASSPATH -DOPEN_CLI_HOME=$OPEN_CLI_HOME org.onap.cli.main.OnapCli "$@" fi |