aboutsummaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
Diffstat (limited to 'deployment')
-rw-r--r--deployment/docker/src/main/docker/Dockerfile8
-rw-r--r--deployment/http/lighttpd/lighttpd.conf2
-rw-r--r--deployment/http/web/index.html63
-rw-r--r--deployment/http/web/occ.html2
-rw-r--r--deployment/zip/installer/install.sh5
-rw-r--r--deployment/zip/pom.xml8
-rwxr-xr-xdeployment/zip/src/main/release/bin/onap.sh8
7 files changed, 69 insertions, 27 deletions
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 @@
-<!DOCTYPE html><html><head><link rel="icon" href="./onap-cli.png">
-<meta charset="utf-8"><title>ONAP CLI</title><style></style>
-<script>
-function redirectToConsole(){
- window.location.href="http://"+ window.location.hostname + ":9090";
-}
-</script>
-</head>
-
-<body onload="showSlides()" style="background-color: white;color: black">
+<!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>
+<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>
+
+<h2><a id="Download_42"></a>To download</h2>
+<p style="color:red">Please download ONAP CLI <a href="./onap-cli.zip">here</a></p>
+
+<h3><a id="Download_42"></a>To install</h3>
+<p>Please follow the instructions given below for installing ONAP CLI.</p>
+<ol>
+<li>Un-zip the above download file into <b>/opt/onap/cli folder</b></li>
+<li>Run the following commands:
+<br>export ONAP_CLI_HOME=$CLI_INSTALL_DIR
+<br>export CLI_PRODUCT_VERSION=onap-1.1
+<br>
+<br>cd $CLI_INSTALL_DIR
+<br>
+<br>if [ ! -d ./data ]; then mkdir ./data; fi
+<br>if [ ! -d ./onap-cli-schema ]; then mkdir ./onap-cli-schema; fi
+<br>
+<br>chmod +x ./bin/onap.sh
+<br>
+<br>#Make onap available in path
+<br>ln ./bin/onap.sh $CLI_BIN
+<br>
+<br>#Print the version
+<br>onap -v</li>
+</ol>
+
+<h2><a id="Console_42"></a>Web Command console</h2>
+<p style="color:blue">To open Console, Click <img src="./onap-cli.png" alt="Web Command console" style="width:30px;height:22px;" onclick="redirectToConsole();"> </p>
+
+<h2><a id="To_Run_a_command_12"></a>To Run a command</h2>
+
+<p>Configure the following environment variables, before using it in Linux console:</p>
+<ol>
+<li><strong>HOST_URL</strong> - Onap Micro service bus(MSB) URL or a service URL</li>
+<li><strong>HOST_USERNAME</strong> - Onap user name</li>
+<li><strong>HOST_PASSWORD</strong> - Onap user password</li>
+</ol>
+
+<p>Type <strong>onap &lt;command&gt;</strong> from Linux console.</p>
+
+<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="More_details_42"></a>More details</h2>
+<p><a href="https://wiki.onap.org">https://wiki.onap.org</a></p>
+
+<h2><a id="Download_42"></a>To download</h2>
+<p style="color:red">Please download ONAP CLI <a href="./open-cli.zip">here</a></p>
</body></html>
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 @@
<html>
<head>
<title>OCC</title>
- <link rel="icon" type="image/png" href="./onap-cli.png">
+ <link rel="icon" type="image/png" href="./open-cli.png">
<link rel="stylesheet" href="./css/index.css" />
<link rel="stylesheet" href="./css/xterm.css" />
<link rel="stylesheet" href="./css/xterm_customize.css" />
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 @@
<version>1.5</version>
<executions>
<execution>
- <id>onap-cli-deployment</id>
+ <id>open-cli-deployment</id>
<phase>package</phase>
<goals>
<goal>execute</goal>
@@ -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