aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-09-19 23:38:20 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-11-14 14:36:27 +0530
commit9c2f77eed27b08e7aa3680bb9f7217dc33cab23d (patch)
tree137a1fb4eccb139bdbfb61942e1681c86a06a142
parent59c0e4f513607e8363b9c9133a5043475d750a9f (diff)
Migrate ONAP_HOST_URL to HOST_URL
Issue-Id: CLI-66 Change-Id: Id2b232651fc1b998faa4134c768f2b77cac89158 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
-rw-r--r--README.md2
-rw-r--r--deployment/docker/src/main/docker/Dockerfile2
-rw-r--r--deployment/http/web/index.html75
-rw-r--r--docs/open_cli_schema_version_1_0.rst2
-rw-r--r--framework/src/main/resources/default_input_parameters.yaml8
5 files changed, 8 insertions, 81 deletions
diff --git a/README.md b/README.md
index 670fbc6f..4762d07d 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ ONAP Command-line interface (CLI)
Provides unified commands to operate ONAP from Linux console.
Configure the following environment variables, before using it:
-1. **ONAP_HOST_URL** - Onap Micro service bus(MSB) URL or a service URL
+1. **HOST_URL** - Onap Micro service bus(MSB) URL or a service URL
2. **ONAP_USERNAME** - Onap user name
3. **ONAP_PASSWORD** - Onap user password
diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile
index 46b4be46..91ca317b 100644
--- a/deployment/docker/src/main/docker/Dockerfile
+++ b/deployment/docker/src/main/docker/Dockerfile
@@ -16,7 +16,7 @@ ENV ONAP_CLI_DEBUG_PORT 5005
ENV CLI_MODE console
ENV CLI_PRODUCT_VERSION onap-1.1
-ENV ONAP_HOST_URL http://localhost:8080
+ENV HOST_URL http://localhost:8080
ENV ONAP_USERNAME guest
ENV ONAP_PASSWORD guest
diff --git a/deployment/http/web/index.html b/deployment/http/web/index.html
index 78294fb0..1bc23d76 100644
--- a/deployment/http/web/index.html
+++ b/deployment/http/web/index.html
@@ -4,52 +4,7 @@
function redirectToConsole(){
window.location.href="http://"+ window.location.hostname + ":9090";
}
-
-var slideIndex = 0;
-
-function showSlides() {
- var i;
- var slides = document.getElementsByClassName("mySlides");
- for (i = 0; i < slides.length; i++) {
- slides[i].style.display = "none";
- }
- slideIndex++;
- if (slideIndex > slides.length) {slideIndex = 1}
- slides[slideIndex-1].style.display = "block";
- setTimeout(showSlides, 2000); // Change image every 2 seconds
-}
-
</script>
-<style>
-
-body {
- margin: 0 1% 0;
- background-color: black
-}
-
-.readme {
- display: inline-block;
- float: left;
- margin: 3% 3% 0;
-
-}
-
-* {box-sizing:border-box}
-
-.slideshow-container {
- display: inline-block;
- float: right;
- max-width: 700px;
- position: relative;
- margin: 6% 3% 0;
-}
-
-.mySlides {
- display: none;
-}
-
-</style>
-
</head>
<body onload="showSlides()" style="background-color: white;color: black">
@@ -80,32 +35,4 @@ body {
</i></p>
</div>
-<div class="slideshow-container">
- <div class="mySlides">
- <img src="images/onap-cli-ad-1.png" style="width:80%">
- </div>
-
- <div class="mySlides">
- <img src="images/onap-cli-ad-2.png" style="width:80%">
- </div>
-
- <div class="mySlides">
- <img src="images/onap-cli-ad-3.png" style="width:80%">
- </div>
-
- <div class="mySlides">
- <img src="images/onap-cli-ad-4.png" style="width:80%">
- </div>
-
- <div class="mySlides">
- <img src="images/onap-cli-ad-5.png" style="width:80%">
- </div>
-
- <div class="mySlides">
- <img src="images/onap-cli-ad-6.png" style="width:80%">
- </div>
-
-</div>
-
-
-</body></html> \ No newline at end of file
+</body></html>
diff --git a/docs/open_cli_schema_version_1_0.rst b/docs/open_cli_schema_version_1_0.rst
index c907172e..f2e1d66a 100644
--- a/docs/open_cli_schema_version_1_0.rst
+++ b/docs/open_cli_schema_version_1_0.rst
@@ -518,7 +518,7 @@ name: host-url
is_optional: false
- default_value: ${ONAP_HOST_URL}
+ default_value: ${HOST_URL}
name: help
~~~~~~~~~~
diff --git a/framework/src/main/resources/default_input_parameters.yaml b/framework/src/main/resources/default_input_parameters.yaml
index 0503ff90..cc56ee2c 100644
--- a/framework/src/main/resources/default_input_parameters.yaml
+++ b/framework/src/main/resources/default_input_parameters.yaml
@@ -17,20 +17,20 @@ parameters:
is_optional: false
- name: host-url
type: url
- description: Onap host url
+ description: host url in http(s)
short_option: m
long_option: host-url
is_optional: false
- default_value: ${ONAP_HOST_URL}
+ default_value: ${HOST_URL}
- name: help
type: string
- description: Onap command help message
+ description: print help message
short_option: h
long_option: help
default_value: false
- name: version
type: string
- description: Onap command service version
+ description: print service version
short_option: v
long_option: version
default_value: false