From 47b65efd69c5158d958261846803d2e15adfb448 Mon Sep 17 00:00:00 2001 From: "Kotagiri, Ramprasad (rp5662)" Date: Fri, 21 Aug 2020 08:40:37 -0400 Subject: java 11 upgrade and sonar scan fixes Recompile java source code using jdk11 Run in ojdk11 JRE tomcat container upgrade alpine base image Issue-ID: DCAEGEN2-2298 Change-Id: Ic4bf2626e5805508589cafe52b7c4e91d7ae3580 Signed-off-by: Kotagiri, Ramprasad (rp5662) --- .../webapp/WEB-INF/conf/system.properties.template | 2 +- ccsdk-app-os/src/main/webapp/api-specs.html | 1625 +++++++------------- .../app/ccsdk/home/executions-view-controller.js | 1 + .../webapp/app/ccsdk/home/executions_view.html | 14 +- .../src/main/webapp/app/ccsdk/home/oom-style.css | 635 ++++---- 5 files changed, 933 insertions(+), 1344 deletions(-) (limited to 'ccsdk-app-os/src/main/webapp') diff --git a/ccsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties.template b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties.template index 940bcf1..2ca6f1b 100644 --- a/ccsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties.template +++ b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties.template @@ -51,7 +51,7 @@ mobile_enable = false # Cache config file is needed on the classpath cache_config_file_path = /WEB-INF/classes/cache.ccf -cache_switch = 199 +cache_switch = 1 cache_load_on_startup = false user_name = fullName diff --git a/ccsdk-app-os/src/main/webapp/api-specs.html b/ccsdk-app-os/src/main/webapp/api-specs.html index 9a7d498..6dadc64 100644 --- a/ccsdk-app-os/src/main/webapp/api-specs.html +++ b/ccsdk-app-os/src/main/webapp/api-specs.html @@ -1504,6 +1504,11 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc +
  • + Authentication + +
    • +
  • Blueprints @@ -1606,11 +1611,6 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
    • -
  • - ComponentInput - -
    • -
  • InlineResponse200 @@ -1627,7 +1627,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
  • - DCAEService + Deployment
    • @@ -1661,6 +1661,11 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc +
  • + DCAEServiceTypeSummary + +
    • +
  • CloudifyDeploymentUpgradeRequest @@ -1717,7 +1722,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc

    Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.

    -

    API to manage deployment of microservices using blueprints.

    +

    API to manage deployment of microservices using blueprints. HTTP Basic authorization schema is required to authenticate users for all the resource endpoints. The client sends HTTP requests with an Authorization header containing base64-encoded username:password string.

    Base URLs:

    • @@ -1728,6 +1733,10 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc

    Email: Support

    +

    Authentication

    +
      +
    • HTTP Authentication, scheme: basic
      • +

    Blueprints

    Query blueprint information

    List Blueprints

    @@ -1741,14 +1750,14 @@ headers = { } r = requests.get('https://dcae-dashboard:8080/ccsdk-app/nb-api/v2/blueprints', params={ - 'pageNum': 'string', 'viewPerPage': 'string' + }, headers = headers) print r.json() 
    # You can also use wget
-curl -X GET https://dcae-dashboard:8080/ccsdk-app/nb-api/v2/blueprints?pageNum=string&viewPerPage=string \
+curl -X GET https://dcae-dashboard:8080/ccsdk-app/nb-api/v2/blueprints \
   -H 'Accept: application/json'
    @@ -1768,48 +1777,25 @@ curl -X GET https://dcae-dashboard:8080/ccsdk-app/nb-api/v2/blueprints?pageNum=s -pageNum +page query string -true -pagination control - page number +false +page number -viewPerPage +size query string -true -pagination control - page size +false +page size -_include +filters query -array[string] +string false -blueprint object properties need to be considered for filter - - - -

    Enumerated Values

    - - - - - - - - - - - - - - - - - - - +
    ParameterValue
    _includetypeName
    _includetypeId
    _includetypeVersionsearch filters, {"owner":"user1", "name":"user1-bp1","id":"2334-343"}
    @@ -1820,72 +1806,17 @@ curl -X GET https://dcae-dashboard:8080/ccsdk-app/nb-api/v2/blueprints?pageNum=s

    200 Response

    {
-  "links": {
-    "previousLink": {
-      "title": "string",
-      "rel": "string",
-      "uri": "http://example.com",
-      "uriBuilder": {},
-      "rels": [
-        "string"
-      ],
-      "params": {
-        "property1": "string",
-        "property2": "string"
-      },
-      "type": "string"
-    },
-    "nextLink": {
-      "title": "string",
-      "rel": "string",
-      "uri": "http://example.com",
-      "uriBuilder": {},
-      "rels": [
-        "string"
-      ],
-      "params": {
-        "property1": "string",
-        "property2": "string"
-      },
-      "type": "string"
-    }
-  },
-  "totalCount": 0,
+  "totalItems": 0,
+  "totalPages": 0,
   "items": [
     {
       "owner": "string",
       "typeName": "string",
+      "application": "string",
+      "component": "string",
       "typeVersion": 0,
-      "blueprintTemplate": "string",
-      "serviceIds": [
-        "string"
-      ],
-      "vnfTypes": [
-        "string"
-      ],
-      "serviceLocations": [
-        "string"
-      ],
-      "asdcServiceId": "string",
-      "asdcResourceId": "string",
-      "asdcServiceURL": "string",
       "typeId": "string",
-      "selfLink": {
-        "title": "string",
-        "rel": "string",
-        "uri": "http://example.com",
-        "uriBuilder": {},
-        "rels": [
-          "string"
-        ],
-        "params": {
-          "property1": "string",
-          "property2": "string"
-        },
-        "type": "string"
-      },
-      "created": "2020-08-12T15:08:29Z",
-      "deactivated": "2020-08-12T15:08:29Z"
+      "created": "2020-08-20T00:20:10Z"
     }
   ]
 }
@@ -1913,10 +1844,45 @@ curl -X GET https://dcae-dashboard:8080/ccsdk-app/nb-api/v2/blueprints?pageNum=s
 Invalid tag value
 None
 
+
+401
+Unauthorized
+Authentication information is missing or invalid
+None
+
+
+
+
    Response Headers
    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    StatusHeaderTypeFormatDescription
    200Linkstringpagination header
    401WWW_Authenticatestringnone
    
     
 
    
-