DCAE dashboard updates ver 1.3.0

Update DB Schema to include new menu items for API doc
Update the page footer for latest copyright

Issue-ID: DCAEGEN2-1856
Issue-ID: DCAEGEN2-1556
Change-Id: Ia7f52b6f0151db62f2155fa26d0f50a1157e7481
Signed-off-by: Kotagiri, Ramprasad (rp5662) <rp5662@att.com>

diff --git a/ccsdk-app-os/Dockerfile b/ccsdk-app-os/Dockerfile
index 1e66e38..7c1769e 100644 (file)
--- a/ccsdk-app-os/Dockerfile
+++ b/ccsdk-app-os/Dockerfile
@@ -1,25 +1,21 @@
 # Use an official Tomcat base image
-FROM tomcat:8.5-alpine
+FROM tomcat:8
 
 ENV APPDIR /usr/local/tomcat
-
 ENV APPUSER dash
 
-RUN adduser -u 1000 -D ${APPUSER}
-
-WORKDIR ${APPDIR}
-
 COPY docker-dashboard-installation.sh /tmp/docker-dashboard-installation.sh
 COPY create_table.sql /tmp/create_table.sql
 
 RUN mkdir /home/deployments \
+ && mkdir -p /opt/logs/dcae/dashboard \
+ && useradd -u 1000 -M -U ${APPUSER} \
  && chown -R 1000:1000 ${APPDIR} \
  && chown -R 1000:1000 /home/deployments \
- && apk update \
- && apk add zip \
- && apk add vim \
- && apk add dos2unix \
- && apk add postgresql \
+ && chown -R 1000:1000 /opt/logs/dcae/dashboard \
+ && apt-get update \
+ && apt-get install -y sudo zip vim dos2unix postgresql \
+ && echo "dash ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/dash_update_cert_store \
  && dos2unix /tmp/create_table.sql \
  && dos2unix /tmp/docker-dashboard-installation.sh \
  && chmod +x /tmp/create_table.sql \
@@ -28,6 +24,7 @@ RUN mkdir /home/deployments \
 ARG WAR_FILE
 COPY target/${WAR_FILE} /home/deployments/ccsdk-app.war
 
+WORKDIR ${APPDIR}
 USER ${APPUSER}
 
 CMD ["/tmp/docker-dashboard-installation.sh"]

diff --git a/ccsdk-app-os/create_table.sql b/ccsdk-app-os/create_table.sql
index e7a7f67..9c89ffd 100644 (file)
--- a/ccsdk-app-os/create_table.sql
+++ b/ccsdk-app-os/create_table.sql
@@ -34,10 +34,6 @@ CREATE TABLE IF NOT EXISTS dashboard_pg_db_common.blueprints (
        name varchar(80), 
        blueprint bytea);
 
--- ---------------------------------------------------------------------------------------------------------------
--- This script creates tables for the ECOMP Controller Dashboard web app.
--- in the 1707 release, same tables for both internal and external use.
--- ------------------------------------------------------------------------------------------------------------------
 --- CREATE SCHEMA (schema name);
 
 --- SET SEARCH_PATH = (schema name);
@@ -572,11 +568,6 @@ alter table dashboard_pg_db_common.fn_license
     add constraint fn_license_r02 foreign key (quantum_version_id) references dashboard_pg_db_common.fn_license_version(id);
 
 
--- ---------------------------------------------------------------------------------------------------------------
--- This script populates tables for the ECOMP Controller Dashboard web app.
--- in the 1707 release with data for all versions.
--- ---------------------------------------------------------------------------------------------------------------
-
 --- SET SEARCH_PATH = (schema name);
 
 -- fn_lu_activity
@@ -1020,7 +1011,7 @@ Insert into dashboard_pg_db_common.fn_role_function (ROLE_ID,FUNCTION_CD) values
 Insert into dashboard_pg_db_common.fn_user 
        (USER_ID,ORG_ID,MANAGER_ID,FIRST_NAME,MIDDLE_NAME,LAST_NAME,PHONE,FAX,CELLULAR,EMAIL,ADDRESS_ID,ALERT_METHOD_CD,HRID,ORG_USER_ID,ORG_CODE,LOGIN_ID,LOGIN_PWD,LAST_LOGIN_DATE,ACTIVE_YN,CREATED_ID,CREATED_DATE,MODIFIED_ID,MODIFIED_DATE,IS_INTERNAL_YN,ADDRESS_LINE_1,ADDRESS_LINE_2,CITY,STATE_CD,ZIP_CODE,COUNTRY_CD,LOCATION_CLLI,ORG_MANAGER_USERID,COMPANY,DEPARTMENT_NAME,JOB_TITLE,TIMEZONE,DEPARTMENT,BUSINESS_UNIT,BUSINESS_UNIT_NAME,COST_CENTER,FIN_LOC_CODE,SILO_STATUS) 
        values 
-       (1,null,null,'Super',null,'User','908-901-2494',null,null,'email@ecomp.att.com',null,null,null,'su1234',null,'su','fusion',to_date('21-AUG-14','%d-%M-%Y'),'Y',null,to_date('15-DEC-05','%d-%M-%Y'),1,to_date('21-AUG-14','%d-%M-%Y'),'N',null,null,null,'NJ',null,'US',null,null,null,null,null,10,null,null,null,null,null,null)
+       (1,null,null,'Super',null,'User','908-901-2494',null,null,'email@om.ops.com',null,null,null,'su1234',null,'su','fusion',to_date('21-AUG-14','%d-%M-%Y'),'Y',null,to_date('15-DEC-05','%d-%M-%Y'),1,to_date('21-AUG-14','%d-%M-%Y'),'N',null,null,null,'NJ',null,'US',null,null,null,null,null,10,null,null,null,null,null,null)
        ;
 
 -- fn_app
@@ -1139,15 +1130,15 @@ update dashboard_pg_db_common.fn_function set type = 'menu' , action = '*'  wher
 update dashboard_pg_db_common.fn_function set type = 'menu' , action = '*'  where function_cd = 'login';
 
 -- REST API docs
-Insert into ecompc_db_common.fn_function (FUNCTION_CD,FUNCTION_NAME,TYPE,ACTION) values ('menu_api','API Menu','menu','*');
+Insert into dashboard_pg_db_common.fn_function (FUNCTION_CD,FUNCTION_NAME,TYPE,ACTION) values ('menu_api','API Menu','menu','*');
 
-INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) 
+INSERT INTO dashboard_pg_db_common.fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) 
        VALUES (20,'REST API', 1, 35,'#', 'menu_api', 'Y','N/A','N/A','N/A','N/A','APP','N','icon-arrows-upload');
 
-INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) 
+INSERT INTO dashboard_pg_db_common.fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) 
        VALUES (21,'Documentation', 20, 35,'ecd#/api', 'menu_api', 'Y','N/A','N/A','N/A','N/A','APP','N','');
        
-INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) 
+INSERT INTO dashboard_pg_db_common.fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) 
        VALUES (22,'Swagger Spec', 20, 40,'ecd#/api-spec', 'menu_api', 'Y','N/A','N/A','N/A','N/A','APP','N','');
        
 Insert into dashboard_pg_db_common.fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_api');

diff --git a/ccsdk-app-os/docker-dashboard-installation.sh b/ccsdk-app-os/docker-dashboard-installation.sh
index 030e75a..f5ef4f8 100644 (file)
--- a/ccsdk-app-os/docker-dashboard-installation.sh
+++ b/ccsdk-app-os/docker-dashboard-installation.sh
@@ -3,8 +3,8 @@
 # run import for ca certs
 if [ -e /usr/local/share/ca-certificates/cacert.pem ]
 then
-    mv /usr/local/share/ca-certificates/cacert.pem /usr/local/share/ca-certificates/cacert.crt
-    update-ca-certificates
+    sudo mv /usr/local/share/ca-certificates/cacert.pem /usr/local/share/ca-certificates/cacert.crt
+    sudo -- bash -c 'export JAVA_HOME=/usr/local/openjdk-8; /usr/sbin/update-ca-certificates'
 fi
 
 # Unzip the dashboard war file

diff --git a/ccsdk-app-os/src/main/resources/logback.xml b/ccsdk-app-os/src/main/resources/logback.xml
index faff70c..1856025 100644 (file)
--- a/ccsdk-app-os/src/main/resources/logback.xml
+++ b/ccsdk-app-os/src/main/resources/logback.xml
@@ -3,7 +3,7 @@
     =============LICENSE_START=========================================================
    
     =================================================================================
-     Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+     Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
     ================================================================================
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -18,23 +18,18 @@
      limitations under the License.
     ============LICENSE_END=========================================================
    
-     ECOMP is a trademark and service mark of AT&T Intellectual Property.
  -->
 
 <!DOCTYPE xml>
 <configuration scan="true" scanPeriod="3 seconds" debug="true">
-  <!-- 
-  Logback files for the ECOMP SDK Application "ecomp_app"
-  are created in directory ${catalina.base}/logs/ecomp_app;
-  e.g., apache-tomcat-8.0.35/logs/ecomp_app/application.log  
-  -->
+
   <!--<jmxConfigurator /> -->
 
     <!--  specify the component name -->
   <property name="componentName" value="dashboard"></property>
   
   <!--  specify the base path of the log directory -->
-  <property name="logDirPrefix" value="/opt/logs/ecompc"></property>
+  <property name="logDirPrefix" value="/opt/logs/dcae"></property>
   
   <!-- The directories where logs are written -->
   <property name="logDirectory" value="${logDirPrefix}/${componentName}" />

diff --git a/ccsdk-app-os/src/main/resources/swagger.json b/ccsdk-app-os/src/main/resources/swagger.json
index de1bf0b..9335e72 100644 (file)
--- a/ccsdk-app-os/src/main/resources/swagger.json
+++ b/ccsdk-app-os/src/main/resources/swagger.json
@@ -2,14 +2,14 @@
   "swagger": "2.0",
   "info": {
     "description": "API to manage deployment of microservices using blueprints.",
-    "version": "1.0.0",
+    "version": "1.3.0",
     "title": "DCAE Dashboard API",
     "contact": {
       "email": "rp5662@att.com"
     }
   },
   "host": "dcae-dashboard:8080",
-  "basePath": "/ccsdk-app-os/nb-api",
+  "basePath": "/ccsdk-app/nb-api",
   "tags": [
     {
       "name": "Blueprints",
@@ -1218,4 +1218,4 @@
     "description": "Find out more about Swagger",
     "url": "http://swagger.io"
   }
-}
\ No newline at end of file
+}

diff --git a/ccsdk-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp b/ccsdk-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp
index e023929..b0b63dd 100644 (file)
--- a/ccsdk-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp
+++ b/ccsdk-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp
@@ -106,7 +106,9 @@
                <br />\r
                <div id="footer">\r
                        <div class="terms">\r
-                               Copyright 2017 Open ECOMP and Linux Foundation.\r
+                                        <p class="copyright-text">\r
+                                               &copy; 2020 ONAP. The Linux Foundation.                                 \r
+                                        </p> \r
                        </div>\r
                </div>\r
        </body>\r

diff --git a/ccsdk-app-os/src/main/webapp/api-specs.html b/ccsdk-app-os/src/main/webapp/api-specs.html
index b43fbf4..e5c5dfc 100644 (file)
--- a/ccsdk-app-os/src/main/webapp/api-specs.html
+++ b/ccsdk-app-os/src/main/webapp/api-specs.html
@@ -1755,10 +1755,10 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
 <p>Base URLs:</p>
 <ul>
 <li>
-<p><a href="https://dcae-dashboard:8080/ccsdk-app-os/nb-api">https://dcae-dashboard:8080/ccsdk-app-os/nb-api</a></p>
+<p><a href="https://dcae-dashboard:8080/ccsdk-app/nb-api">https://dcae-dashboard:8080/ccsdk-app/nb-api</a></p>
 </li>
 <li>
-<p><a href="http://dcae-dashboard:8080/ccsdk-app-os/nb-api">http://dcae-dashboard:8080/ccsdk-app-os/nb-api</a></p>
+<p><a href="http://dcae-dashboard:8080/ccsdk-app/nb-api">http://dcae-dashboard:8080/ccsdk-app/nb-api</a></p>
 </li>
 </ul>
 <p>Email: <a href="mailto:rp5662@att.com">Support</a></p>
@@ -1774,7 +1774,7 @@ headers = {
   <span class="hljs-string">'Accept'</span>: <span class="hljs-string">'application/json'</span>
 }
 
-r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app-os/nb-api/blueprints'</span>, params={
+r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app/nb-api/blueprints'</span>, params={
   <span class="hljs-string">'pageNum'</span>: <span class="hljs-string">'string'</span>,  <span class="hljs-string">'viewPerPage'</span>: <span class="hljs-string">'string'</span>
 }, headers = headers)
 
@@ -1782,7 +1782,7 @@ r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-ap
 
 </code></pre>
 <pre class="highlight tab tab-shell"><code><span class="hljs-comment"># You can also use wget</span>
-curl -X GET https://dcae-dashboard:8080/ccsdk-app-os/nb-api/blueprints?pageNum=string&amp;viewPerPage=string \
+curl -X GET https://dcae-dashboard:8080/ccsdk-app/nb-api/blueprints?pageNum=string&amp;viewPerPage=string \
   -H <span class="hljs-string">'Accept: application/json'</span>
 
 </code></pre>
@@ -1962,7 +1962,7 @@ headers = {
   <span class="hljs-string">'Accept'</span>: <span class="hljs-string">'application/json'</span>
 }
 
-r = requests.post(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app-os/nb-api/blueprints'</span>, params={
+r = requests.post(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app/nb-api/blueprints'</span>, params={
 
 }, headers = headers)
 
@@ -1970,7 +1970,7 @@ r = requests.post(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-a
 
 </code></pre>
 <pre class="highlight tab tab-shell"><code><span class="hljs-comment"># You can also use wget</span>
-curl -X POST https://dcae-dashboard:8080/ccsdk-app-os/nb-api/blueprints \
+curl -X POST https://dcae-dashboard:8080/ccsdk-app/nb-api/blueprints \
   -H <span class="hljs-string">'Content-Type: application/json'</span> \
   -H <span class="hljs-string">'Accept: application/json'</span>
 
@@ -2122,7 +2122,7 @@ This operation does not require authentication
 </blockquote>
 <pre class="highlight tab tab-python"><code><span class="hljs-keyword">import</span> requests
 
-r = requests.delete(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app-os/nb-api/blueprints/{typeId}'</span>, params={
+r = requests.delete(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app/nb-api/blueprints/{typeId}'</span>, params={
 
 )
 
@@ -2130,7 +2130,7 @@ r = requests.delete(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk
 
 </code></pre>
 <pre class="highlight tab tab-shell"><code><span class="hljs-comment"># You can also use wget</span>
-curl -X DELETE https://dcae-dashboard:8080/ccsdk-app-os/nb-api/blueprints/{typeId}
+curl -X DELETE https://dcae-dashboard:8080/ccsdk-app/nb-api/blueprints/{typeId}
 
 </code></pre>
 <p><code>DELETE /blueprints/{typeId}</code></p>
@@ -2185,7 +2185,7 @@ This operation does not require authentication
 </blockquote>
 <pre class="highlight tab tab-python"><code><span class="hljs-keyword">import</span> requests
 
-r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app-os/nb-api/blueprints/{typeId}/services'</span>, params={
+r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app/nb-api/blueprints/{typeId}/services'</span>, params={
 
 )
 
@@ -2193,7 +2193,7 @@ r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-ap
 
 </code></pre>
 <pre class="highlight tab tab-shell"><code><span class="hljs-comment"># You can also use wget</span>
-curl -X GET https://dcae-dashboard:8080/ccsdk-app-os/nb-api/blueprints/{typeId}/services
+curl -X GET https://dcae-dashboard:8080/ccsdk-app/nb-api/blueprints/{typeId}/services
 
 </code></pre>
 <p><code>GET /blueprints/{typeId}/services</code></p>
@@ -2251,7 +2251,7 @@ headers = {
   <span class="hljs-string">'Accept'</span>: <span class="hljs-string">'application/json'</span>
 }
 
-r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app-os/nb-api/blueprints/findByName'</span>, params={
+r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app/nb-api/blueprints/findByName'</span>, params={
   <span class="hljs-string">'name'</span>: <span class="hljs-string">'string'</span>
 }, headers = headers)
 
@@ -2259,7 +2259,7 @@ r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-ap
 
 </code></pre>
 <pre class="highlight tab tab-shell"><code><span class="hljs-comment"># You can also use wget</span>
-curl -X GET https://dcae-dashboard:8080/ccsdk-app-os/nb-api/blueprints/findByName?name=string \
+curl -X GET https://dcae-dashboard:8080/ccsdk-app/nb-api/blueprints/findByName?name=string \
   -H <span class="hljs-string">'Accept: application/json'</span>
 
 </code></pre>
@@ -2433,7 +2433,7 @@ headers = {
   <span class="hljs-string">'Accept'</span>: <span class="hljs-string">'application/json'</span>
 }
 
-r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments'</span>, params={
+r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments'</span>, params={
   <span class="hljs-string">'pageNum'</span>: <span class="hljs-string">'string'</span>,  <span class="hljs-string">'viewPerPage'</span>: <span class="hljs-string">'string'</span>
 }, headers = headers)
 
@@ -2441,7 +2441,7 @@ r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-ap
 
 </code></pre>
 <pre class="highlight tab tab-shell"><code><span class="hljs-comment"># You can also use wget</span>
-curl -X GET https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments?pageNum=string&amp;viewPerPage=string \
+curl -X GET https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments?pageNum=string&amp;viewPerPage=string \
   -H <span class="hljs-string">'Accept: application/json'</span>
 
 </code></pre>
@@ -2845,7 +2845,7 @@ headers = {
   <span class="hljs-string">'Accept'</span>: <span class="hljs-string">'application/json'</span>
 }
 
-r = requests.post(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments'</span>, params={
+r = requests.post(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments'</span>, params={
 
 }, headers = headers)
 
@@ -2853,7 +2853,7 @@ r = requests.post(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-a
 
 </code></pre>
 <pre class="highlight tab tab-shell"><code><span class="hljs-comment"># You can also use wget</span>
-curl -X POST https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments \
+curl -X POST https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments \
   -H <span class="hljs-string">'Content-Type: application/json'</span> \
   -H <span class="hljs-string">'Accept: application/json'</span>
 
@@ -2947,7 +2947,7 @@ headers = {
   <span class="hljs-string">'Accept'</span>: <span class="hljs-string">'application/json'</span>
 }
 
-r = requests.delete(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments/{deploymentId}'</span>, params={
+r = requests.delete(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments/{deploymentId}'</span>, params={
   <span class="hljs-string">'tenant'</span>: <span class="hljs-string">'string'</span>
 }, headers = headers)
 
@@ -2955,7 +2955,7 @@ r = requests.delete(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk
 
 </code></pre>
 <pre class="highlight tab tab-shell"><code><span class="hljs-comment"># You can also use wget</span>
-curl -X DELETE https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments/{deploymentId}?tenant=string \
+curl -X DELETE https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments/{deploymentId}?tenant=string \
   -H <span class="hljs-string">'Accept: application/json'</span>
 
 </code></pre>
@@ -3035,7 +3035,7 @@ headers = {
   <span class="hljs-string">'Content-Type'</span>: <span class="hljs-string">'application/json'</span>
 }
 
-r = requests.put(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments/{deploymentId}'</span>, params={
+r = requests.put(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments/{deploymentId}'</span>, params={
 
 }, headers = headers)
 
@@ -3043,7 +3043,7 @@ r = requests.put(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-ap
 
 </code></pre>
 <pre class="highlight tab tab-shell"><code><span class="hljs-comment"># You can also use wget</span>
-curl -X PUT https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments/{deploymentId} \
+curl -X PUT https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments/{deploymentId} \
   -H <span class="hljs-string">'Content-Type: application/json'</span>
 
 </code></pre>
@@ -3133,7 +3133,7 @@ headers = {
   <span class="hljs-string">'Accept'</span>: <span class="hljs-string">'application/json'</span>
 }
 
-r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments/{deploymentId}'</span>, params={
+r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments/{deploymentId}'</span>, params={
 
 }, headers = headers)
 
@@ -3141,7 +3141,7 @@ r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-ap
 
 </code></pre>
 <pre class="highlight tab tab-shell"><code><span class="hljs-comment"># You can also use wget</span>
-curl -X GET https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments/{deploymentId} \
+curl -X GET https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments/{deploymentId} \
   -H <span class="hljs-string">'Accept: application/json'</span>
 
 </code></pre>
@@ -3537,7 +3537,7 @@ headers = {
   <span class="hljs-string">'Content-Type'</span>: <span class="hljs-string">'application/json'</span>
 }
 
-r = requests.put(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments/{deploymentId}/update'</span>, params={
+r = requests.put(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments/{deploymentId}/update'</span>, params={
 
 }, headers = headers)
 
@@ -3545,7 +3545,7 @@ r = requests.put(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-ap
 
 </code></pre>
 <pre class="highlight tab tab-shell"><code><span class="hljs-comment"># You can also use wget</span>
-curl -X PUT https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments/{deploymentId}/update \
+curl -X PUT https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments/{deploymentId}/update \
   -H <span class="hljs-string">'Content-Type: application/json'</span>
 
 </code></pre>
@@ -3636,7 +3636,7 @@ headers = {
   <span class="hljs-string">'Accept'</span>: <span class="hljs-string">'application/json'</span>
 }
 
-r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments/{deploymentId}/executions'</span>, params={
+r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments/{deploymentId}/executions'</span>, params={
   <span class="hljs-string">'tenant'</span>: <span class="hljs-string">'string'</span>
 }, headers = headers)
 
@@ -3644,7 +3644,7 @@ r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-ap
 
 </code></pre>
 <pre class="highlight tab tab-shell"><code><span class="hljs-comment"># You can also use wget</span>
-curl -X GET https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments/{deploymentId}/executions?tenant=string \
+curl -X GET https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments/{deploymentId}/executions?tenant=string \
   -H <span class="hljs-string">'Accept: application/json'</span>
 
 </code></pre>
@@ -3797,7 +3797,7 @@ headers = {
   <span class="hljs-string">'Accept'</span>: <span class="hljs-string">'application/json'</span>
 }
 
-r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments/{deploymentId}/health'</span>, params={
+r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments/{deploymentId}/health'</span>, params={
 
 }, headers = headers)
 
@@ -3805,7 +3805,7 @@ r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-ap
 
 </code></pre>
 <pre class="highlight tab tab-shell"><code><span class="hljs-comment"># You can also use wget</span>
-curl -X GET https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments/{deploymentId}/health \
+curl -X GET https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments/{deploymentId}/health \
   -H <span class="hljs-string">'Accept: application/json'</span>
 
 </code></pre>
@@ -3879,7 +3879,7 @@ headers = {
   <span class="hljs-string">'Accept'</span>: <span class="hljs-string">'application/json'</span>
 }
 
-r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments/{deploymentId}/inputs'</span>, params={
+r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments/{deploymentId}/inputs'</span>, params={
   <span class="hljs-string">'tenant'</span>: <span class="hljs-string">'string'</span>
 }, headers = headers)
 
@@ -3887,7 +3887,7 @@ r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-ap
 
 </code></pre>
 <pre class="highlight tab tab-shell"><code><span class="hljs-comment"># You can also use wget</span>
-curl -X GET https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments/{deploymentId}/inputs?tenant=string \
+curl -X GET https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments/{deploymentId}/inputs?tenant=string \
   -H <span class="hljs-string">'Accept: application/json'</span>
 
 </code></pre>
@@ -3970,7 +3970,7 @@ headers = {
   <span class="hljs-string">'Accept'</span>: <span class="hljs-string">'application/json'</span>
 }
 
-r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app-os/nb-api/tenants'</span>, params={
+r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app/nb-api/tenants'</span>, params={
 
 }, headers = headers)
 
@@ -3978,7 +3978,7 @@ r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-ap
 
 </code></pre>
 <pre class="highlight tab tab-shell"><code><span class="hljs-comment"># You can also use wget</span>
-curl -X GET https://dcae-dashboard:8080/ccsdk-app-os/nb-api/tenants \
+curl -X GET https://dcae-dashboard:8080/ccsdk-app/nb-api/tenants \
   -H <span class="hljs-string">'Accept: application/json'</span>
 
 </code></pre>
@@ -4065,7 +4065,7 @@ headers = {
   <span class="hljs-string">'Accept'</span>: <span class="hljs-string">'application/json'</span>
 }
 
-r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app-os/nb-api/components'</span>, params={
+r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app/nb-api/components'</span>, params={
 
 }, headers = headers)
 
@@ -4073,7 +4073,7 @@ r = requests.get(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-ap
 
 </code></pre>
 <pre class="highlight tab tab-shell"><code><span class="hljs-comment"># You can also use wget</span>
-curl -X GET https://dcae-dashboard:8080/ccsdk-app-os/nb-api/components \
+curl -X GET https://dcae-dashboard:8080/ccsdk-app/nb-api/components \
   -H <span class="hljs-string">'Accept: application/json'</span>
 
 </code></pre>
@@ -4175,7 +4175,7 @@ headers = {
   <span class="hljs-string">'Accept'</span>: <span class="hljs-string">'*/*'</span>
 }
 
-r = requests.post(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app-os/nb-api/components'</span>, params={
+r = requests.post(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-app/nb-api/components'</span>, params={
 
 }, headers = headers)
 
@@ -4183,7 +4183,7 @@ r = requests.post(<span class="hljs-string">'https://dcae-dashboard:8080/ccsdk-a
 
 </code></pre>
 <pre class="highlight tab tab-shell"><code><span class="hljs-comment"># You can also use wget</span>
-curl -X POST https://dcae-dashboard:8080/ccsdk-app-os/nb-api/components \
+curl -X POST https://dcae-dashboard:8080/ccsdk-app/nb-api/components \
   -H <span class="hljs-string">'Content-Type: application/json'</span> \
   -H <span class="hljs-string">'Accept: */*'</span>
 

diff --git a/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html b/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html
index f4d8d7e..65ac372 100644 (file)
--- a/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html
+++ b/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html
@@ -4,7 +4,7 @@
                        <div class="divider-bottom-footer">
                                <div class="span12 footerLogo"> 
                                         <p class="copyright-text">
-                                               Copyright 2017 Open ECOMP and Linux Foundation. <span class="build_number">Build Number: {{build_number}}</span>                                                                
+                                               &copy; 2020 ONAP. The Linux Foundation. <span class="build_number">Build Number: {{build_number}}</span>                                                                
                                         </p>   
                                </div>
                        </div>

diff --git a/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/header-logo.html b/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/header-logo.html
similarity index 100%
rename from ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/header-logo.html
rename to ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/header-logo.html

diff --git a/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html b/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html
similarity index 100%
rename from ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html
rename to ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html

diff --git a/ccsdk-app-overlay/pom.xml b/ccsdk-app-overlay/pom.xml
index b9b7809..f6177be 100644 (file)
--- a/ccsdk-app-overlay/pom.xml
+++ b/ccsdk-app-overlay/pom.xml
@@ -34,7 +34,7 @@
                                        <target>1.8</target>
                                </configuration>
                        </plugin>
-               </plugins>
+       </plugins>
        </build>
 
        <dependencies>

diff --git a/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-router.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-router.js
index 592ab15..0b43341 100644 (file)
--- a/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-router.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-router.js
@@ -36,6 +36,10 @@ appDS2.config(function($routeProvider) {
                templateUrl: 'app/ccsdk/inventory/inventory_deployment_table.html',
                controller : 'inventoryDeploymentTableController'
        })
+       .when('/idep/:depId', { 
+               templateUrl: 'app/ccsdk/inventory/inventory_deployment_table.html',
+               controller : 'inventoryDeploymentTableController'
+       })
        .when('/sh', { 
                templateUrl: 'app/ccsdk/consul/service_health_table.html',
                controller : 'serviceHealthTableController'

diff --git a/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/deployment-controllers.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/deployment-controllers.js
index 714528c..e17dcae 100644 (file)
--- a/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/deployment-controllers.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/deployment-controllers.js
@@ -1,5 +1,7 @@
 appDS2.controller('inventoryDeploymentTableController', function(
-               $rootScope, $scope, $interval, $log, $modal, modalService, InventoryDeploymentService, InventoryBlueprintService) {
+               $rootScope, $scope, $routeParams, $route, 
+               $interval, $log, $modal, modalService, 
+               InventoryDeploymentService, InventoryBlueprintService) {
 
        'use strict';
 
@@ -19,7 +21,7 @@ appDS2.controller('inventoryDeploymentTableController', function(
        // sorting
        $scope.ecdapp.sortBy = null;
        // searching
-       $scope.ecdapp.searchBy = null;
+       $scope.ecdapp.searchBy = $routeParams.depId;
        $scope.ecdapp.selectedRow = null;  // initialize our variable to null
        $scope.ecdapp.setClickedRow = function(index){  //function that sets the value of selectedRow to current index
                $scope.ecdapp.selectedRow = index;

diff --git a/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/inventory_blueprint_table.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/inventory_blueprint_table.html
index 6dd0f07..763d956 100644 (file)
--- a/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/inventory_blueprint_table.html
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/inventory_blueprint_table.html
@@ -143,7 +143,8 @@
                                        <div> <span class="font-medium">{{$index+1}}</span> </div>      
                                        <div class="b2b-leading-dots">
                                                <span class="font-medium">Deployment ID</span>
-                                               <span class="pull-right" ng-bind="srvcData.serviceId"/>
+                                               <!--  <span class="pull-right" ng-bind="srvcData.serviceId"><a href="ecd#/idep/{{srvcData.serviceId}}"></a></span>-->
+                                               <span class="pull-right"><a href="ecd#/idep/{{srvcData.serviceId}}">{{srvcData.serviceId}}</a></span>
                                        </div>
                                        <div class="b2b-leading-dots">
                                                <span class="font-medium">Created timestamp</span>

diff --git a/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html b/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html
deleted file mode 100644 (file)
index 65ac372..0000000
--- a/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div style="width: 100%">
-       <footer class="b2b-footer-wrapper" role="contentinfo" aria-label="footer">
-               <div class="b2b-footer-container" >
-                       <div class="divider-bottom-footer">
-                               <div class="span12 footerLogo"> 
-                                        <p class="copyright-text">
-                                               &copy; 2020 ONAP. The Linux Foundation. <span class="build_number">Build Number: {{build_number}}</span>                                                                
-                                        </p>   
-                               </div>
-                       </div>
-               </div>
-       </footer>
-</div> 
\ No newline at end of file

diff --git a/version.properties b/version.properties
index 7f86aa1..a254b21 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -3,7 +3,7 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major=1
-minor=1
+minor=3
 patch=0
 
 base_version=${major}.${minor}.${patch}