Redirecting

From 7019f6d9af89b6fadc72d3d9f1f303b5278e7555 Mon Sep 17 00:00:00 2001 From: "Kotagiri, Ramprasad (rp5662)" Date: Thu, 13 Feb 2020 16:39:57 -0500 Subject: 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) --- ccsdk-app-os/src/main/resources/logback.xml | 11 +--- ccsdk-app-os/src/main/resources/swagger.json | 6 +- .../src/main/webapp/WEB-INF/jsp/login_external.jsp | 4 +- ccsdk-app-os/src/main/webapp/api-specs.html | 72 +++++++++++----------- .../app/fusion/scripts/DS2-view-models/footer.html | 2 +- .../scripts/DS2-view-models/header-logo.html | 3 + .../fusion/scripts/DS2-view-models/welcome.html | 16 +++++ 7 files changed, 65 insertions(+), 49 deletions(-) create mode 100644 ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/header-logo.html create mode 100644 ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html (limited to 'ccsdk-app-os/src') diff --git a/ccsdk-app-os/src/main/resources/logback.xml b/ccsdk-app-os/src/main/resources/logback.xml index faff70c..1856025 100644 --- 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. --> - + - + diff --git a/ccsdk-app-os/src/main/resources/swagger.json b/ccsdk-app-os/src/main/resources/swagger.json index de1bf0b..9335e72 100644 --- 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 --- 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 @@
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 --- 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

Base URLs:

Email: Support

@@ -1774,7 +1774,7 @@ headers = { 'Accept': 'application/json' } -r = requests.get('https://dcae-dashboard:8080/ccsdk-app-os/nb-api/blueprints', params={ +r = requests.get('https://dcae-dashboard:8080/ccsdk-app/nb-api/blueprints', params={ 'pageNum': 'string', 'viewPerPage': 'string' }, headers = headers) @@ -1782,7 +1782,7 @@ r = requests.get('https://dcae-dashboard:8080/ccsdk-ap

# You can also use wget
-curl -X GET https://dcae-dashboard:8080/ccsdk-app-os/nb-api/blueprints?pageNum=string&viewPerPage=string \
+curl -X GET https://dcae-dashboard:8080/ccsdk-app/nb-api/blueprints?pageNum=string&viewPerPage=string \
   -H 'Accept: application/json'

@@ -1962,7 +1962,7 @@ headers = { 'Accept': 'application/json' } -r = requests.post('https://dcae-dashboard:8080/ccsdk-app-os/nb-api/blueprints', params={ +r = requests.post('https://dcae-dashboard:8080/ccsdk-app/nb-api/blueprints', params={ }, headers = headers) @@ -1970,7 +1970,7 @@ r = requests.post('https://dcae-dashboard:8080/ccsdk-a

# You can also use wget
-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 'Content-Type: application/json' \
   -H 'Accept: application/json'
 
@@ -2122,7 +2122,7 @@ This operation does not require authentication
 
 import requests
 
-r = requests.delete('https://dcae-dashboard:8080/ccsdk-app-os/nb-api/blueprints/{typeId}', params={
+r = requests.delete('https://dcae-dashboard:8080/ccsdk-app/nb-api/blueprints/{typeId}', params={
 
 )
 
@@ -2130,7 +2130,7 @@ r = requests.delete('https://dcae-dashboard:8080/ccsdk
 
 
 # You can also use wget
-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}
 
 
 DELETE /blueprints/{typeId}
@@ -2185,7 +2185,7 @@ This operation does not require authentication
 
 import requests
 
-r = requests.get('https://dcae-dashboard:8080/ccsdk-app-os/nb-api/blueprints/{typeId}/services', params={
+r = requests.get('https://dcae-dashboard:8080/ccsdk-app/nb-api/blueprints/{typeId}/services', params={
 
 )
 
@@ -2193,7 +2193,7 @@ r = requests.get('https://dcae-dashboard:8080/ccsdk-ap
 
 
 # You can also use wget
-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
 
 
 GET /blueprints/{typeId}/services
@@ -2251,7 +2251,7 @@ headers = {
   'Accept': 'application/json'
 }
 
-r = requests.get('https://dcae-dashboard:8080/ccsdk-app-os/nb-api/blueprints/findByName', params={
+r = requests.get('https://dcae-dashboard:8080/ccsdk-app/nb-api/blueprints/findByName', params={
   'name': 'string'
 }, headers = headers)
 
@@ -2259,7 +2259,7 @@ r = requests.get('https://dcae-dashboard:8080/ccsdk-ap

# You can also use wget
-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 'Accept: application/json'

@@ -2433,7 +2433,7 @@ headers = { 'Accept': 'application/json' } -r = requests.get('https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments', params={ +r = requests.get('https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments', params={ 'pageNum': 'string', 'viewPerPage': 'string' }, headers = headers) @@ -2441,7 +2441,7 @@ r = requests.get('https://dcae-dashboard:8080/ccsdk-ap

# You can also use wget
-curl -X GET https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments?pageNum=string&viewPerPage=string \
+curl -X GET https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments?pageNum=string&viewPerPage=string \
   -H 'Accept: application/json'

@@ -2845,7 +2845,7 @@ headers = { 'Accept': 'application/json' } -r = requests.post('https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments', params={ +r = requests.post('https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments', params={ }, headers = headers) @@ -2853,7 +2853,7 @@ r = requests.post('https://dcae-dashboard:8080/ccsdk-a

# You can also use wget
-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 'Content-Type: application/json' \
   -H 'Accept: application/json'
 
@@ -2947,7 +2947,7 @@ headers = {
   'Accept': 'application/json'
 }
 
-r = requests.delete('https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments/{deploymentId}', params={
+r = requests.delete('https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments/{deploymentId}', params={
   'tenant': 'string'
 }, headers = headers)
 
@@ -2955,7 +2955,7 @@ r = requests.delete('https://dcae-dashboard:8080/ccsdk

# You can also use wget
-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 'Accept: application/json'

@@ -3035,7 +3035,7 @@ headers = { 'Content-Type': 'application/json' } -r = requests.put('https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments/{deploymentId}', params={ +r = requests.put('https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments/{deploymentId}', params={ }, headers = headers) @@ -3043,7 +3043,7 @@ r = requests.put('https://dcae-dashboard:8080/ccsdk-ap

# You can also use wget
-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 'Content-Type: application/json'

@@ -3133,7 +3133,7 @@ headers = { 'Accept': 'application/json' } -r = requests.get('https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments/{deploymentId}', params={ +r = requests.get('https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments/{deploymentId}', params={ }, headers = headers) @@ -3141,7 +3141,7 @@ r = requests.get('https://dcae-dashboard:8080/ccsdk-ap

# You can also use wget
-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 'Accept: application/json'

@@ -3537,7 +3537,7 @@ headers = { 'Content-Type': 'application/json' } -r = requests.put('https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments/{deploymentId}/update', params={ +r = requests.put('https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments/{deploymentId}/update', params={ }, headers = headers) @@ -3545,7 +3545,7 @@ r = requests.put('https://dcae-dashboard:8080/ccsdk-ap

# You can also use wget
-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 'Content-Type: application/json'

@@ -3636,7 +3636,7 @@ headers = { 'Accept': 'application/json' } -r = requests.get('https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments/{deploymentId}/executions', params={ +r = requests.get('https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments/{deploymentId}/executions', params={ 'tenant': 'string' }, headers = headers) @@ -3644,7 +3644,7 @@ r = requests.get('https://dcae-dashboard:8080/ccsdk-ap

# You can also use wget
-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 'Accept: application/json'

@@ -3797,7 +3797,7 @@ headers = { 'Accept': 'application/json' } -r = requests.get('https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments/{deploymentId}/health', params={ +r = requests.get('https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments/{deploymentId}/health', params={ }, headers = headers) @@ -3805,7 +3805,7 @@ r = requests.get('https://dcae-dashboard:8080/ccsdk-ap

# You can also use wget
-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 'Accept: application/json'

@@ -3879,7 +3879,7 @@ headers = { 'Accept': 'application/json' } -r = requests.get('https://dcae-dashboard:8080/ccsdk-app-os/nb-api/deployments/{deploymentId}/inputs', params={ +r = requests.get('https://dcae-dashboard:8080/ccsdk-app/nb-api/deployments/{deploymentId}/inputs', params={ 'tenant': 'string' }, headers = headers) @@ -3887,7 +3887,7 @@ r = requests.get('https://dcae-dashboard:8080/ccsdk-ap

# You can also use wget
-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 'Accept: application/json'

@@ -3970,7 +3970,7 @@ headers = { 'Accept': 'application/json' } -r = requests.get('https://dcae-dashboard:8080/ccsdk-app-os/nb-api/tenants', params={ +r = requests.get('https://dcae-dashboard:8080/ccsdk-app/nb-api/tenants', params={ }, headers = headers) @@ -3978,7 +3978,7 @@ r = requests.get('https://dcae-dashboard:8080/ccsdk-ap

# You can also use wget
-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 'Accept: application/json'

@@ -4065,7 +4065,7 @@ headers = { 'Accept': 'application/json' } -r = requests.get('https://dcae-dashboard:8080/ccsdk-app-os/nb-api/components', params={ +r = requests.get('https://dcae-dashboard:8080/ccsdk-app/nb-api/components', params={ }, headers = headers) @@ -4073,7 +4073,7 @@ r = requests.get('https://dcae-dashboard:8080/ccsdk-ap

# You can also use wget
-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 'Accept: application/json'

@@ -4175,7 +4175,7 @@ headers = { 'Accept': '*/*' } -r = requests.post('https://dcae-dashboard:8080/ccsdk-app-os/nb-api/components', params={ +r = requests.post('https://dcae-dashboard:8080/ccsdk-app/nb-api/components', params={ }, headers = headers) @@ -4183,7 +4183,7 @@ r = requests.post('https://dcae-dashboard:8080/ccsdk-a

# You can also use wget
-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 'Content-Type: application/json' \
   -H 'Accept: */*'
 
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
--- 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 @@
 			
 					
 					 
-					 	Copyright 2017 Open ECOMP and Linux Foundation. Build Number: {{build_number}}								
+					 	© 2020 ONAP. The Linux Foundation. Build Number: {{build_number}}								
 					  	
 				
 			
diff --git a/ccsdk-app-os/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
new file mode 100644
index 0000000..942af9b
--- /dev/null
+++ b/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/header-logo.html
@@ -0,0 +1,3 @@
+ 
+	DCAE Dashboard
+
\ No newline at end of file
diff --git a/ccsdk-app-os/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
new file mode 100644
index 0000000..1c90f97
--- /dev/null
+++ b/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html
@@ -0,0 +1,16 @@
+ 
+        
+    Redirecting      
+    
+        
+      
+   
+    
+    	Redirecting to the DCAE Dashboard..
+     
+    
+
-- 
cgit 1.2.3-korg