Merge pull request #61 from smartdevicelink/develop

Develop to master
smartdevicelink · Jun 5, 2019 · 521d75f · 521d75f
2 parents e3b6d96 + eb682b9
commit 521d75f
Show file tree

Hide file tree

Showing 5 changed files with 1,248 additions and 1,211 deletions.
diff --git a/api/v2/app/interfaces/job/manticore/core-image-settings.js b/api/v2/app/interfaces/job/manticore/core-image-settings.js
@@ -82,7 +82,8 @@ function configurationToImageInfo (coreVersion, coreBuild, id) {
             broker: 9000,
             tcp: 12345,
             file: 3001,
-            log: 8888
+            log: 8888,
+            policy: 9898
         },
         services: [
             {
@@ -124,6 +125,19 @@ function configurationToImageInfo (coreVersion, coreBuild, id) {
                         Protocol: "ws"
                     }
                 ]
+            },
+            {
+                name: `core-policy-${id}`,
+                port: "policy",
+                checks: [
+                    {
+                        Type: "http",
+                        Interval: 3000000000, //3 seconds
+                        Timeout: 1000000000, //1 second
+                        Path: "/",
+                        Protocol: "http"
+                    }
+                ]
             }
         ],
         envs: {},

diff --git a/api/v2/app/interfaces/job/manticore/index.js b/api/v2/app/interfaces/job/manticore/index.js
@@ -19,12 +19,12 @@ const HMI_HEALTH_TIME = 8000;
 
 const jobInfo = {
     core: {
-        versions: ["5.0.1"], //ex. 5.0.1, master, develop
+        versions: ["5.1.2"], //ex. 5.0.1, master, develop
         builds: ["default"]
     }, 
     hmis: [{
         type: "generic",
-        versions: ["minimal-0.5.1"] //ex. master, minimal-0.5.1
+        versions: ["minimal-0.6.1"] //ex. master, minimal-0.5.1
     }]
 };
 
@@ -150,6 +150,9 @@ async function advance (ctx) {
             currentRequest.services.manticore[`core-log-${id}-0`].external = randomString(PATTERN, 16);
             currentRequest.services.manticore[`core-log-${id}-0`].isHttp = true;
 
+            currentRequest.services.manticore[`core-policy-${id}-0`].external = randomString(PATTERN, 16);
+            currentRequest.services.manticore[`core-policy-${id}-0`].isHttp = true;
+
             currentRequest.services.manticore[`core-tcp-${id}-0`].external = coreTcpPort;
             currentRequest.services.manticore[`core-tcp-${id}-0`].isHttp = false;
 
@@ -281,6 +284,7 @@ function formatAddresses (id, services) {
         "core-tcp": utils.formatTcpAddress(services.manticore[`core-tcp-${id}-0`]),
         "core-file": utils.formatHttpAddress(services.manticore[`core-file-${id}-0`]),
         "core-log": utils.formatWsAddress(services.manticore[`core-log-${id}-0`]),
+        "core-policy": utils.formatHttpAddress(services.manticore[`core-policy-${id}-0`]),
         "hmi-user": utils.formatHttpAddress(services.manticore[`hmi-user-${id}-0`]),
     };
 }
@@ -289,12 +293,12 @@ function formatAddresses (id, services) {
 function exampleJobOption () {
     return {
         core: {
-            version: "5.0.1",
+            version: "5.1.2",
             build: "default"
         },
         hmi: {
             type: "generic",
-            version: "minimal-0.5.1"
+            version: "minimal-0.6.1"
         }
     };
 }