add templates and up version

playground · Mar 18, 2024 · 9bfadb1 · 9bfadb1
1 parent 755942a
commit 9bfadb1
Show file tree

Hide file tree

Showing 11 changed files with 128 additions and 453 deletions.
diff --git a/agent-install.sh b/agent-install.sh
diff --git a/build/common/src/env-hzn.json b/build/common/src/env-hzn.json
@@ -2,16 +2,16 @@
   "biz": 
   {
     "envVars": {
-      "SERVICE_NAME": "saved-model-service",
-      "SERVICE_CONTAINER_NAME": "saved-model-service",
+      "SERVICE_NAME": "mms-agent",
+      "SERVICE_CONTAINER_NAME": "mms-agent",
       "SERVICE_VERSION": "1.0.0",
       "SERVICE_VERSION_RANGE_UPPER": "1.0.0",
       "SERVICE_VERSION_RANGE_LOWER": "1.0.0",
       "SERVICE_CONTAINER_CREDS": "",
       "VOLUME_MOUNT": "/mms-shared",
       "MMS_SHARED_VOLUME": "mms_shared_volume",
-      "MMS_OBJECT_TYPE": "object_detection",
-      "MMS_OBJECT_ID": "config.json",
+      "MMS_OBJECT_TYPE": "mms_agent_config",
+      "MMS_OBJECT_ID": "mms_agent_config_json",
       "MMS_OBJECT_FILE": "config/config.json",
       "MMS_CONTAINER_CREDS": "",
       "MMS_CONTAINER_NAME": "mms-service",

diff --git a/build/common/src/hzn-config/object.policy.json b/build/common/src/hzn-config/object.policy.json
@@ -3,9 +3,9 @@
     "objectType": "$MMS_OBJECT_TYPE",
     "destinationOrgID": "$HZN_ORG_ID",
     "destinationPolicy": {
-        "constrints": [
+        "constraints": [
             {
-                "name": "workersafety",
+                "name": "worker-safety",
                 "value": "Worker Safety"
             }
         ],

diff --git a/build/common/src/hzn-config/services/top-level-service/service.definition.json b/build/common/src/hzn-config/services/top-level-service/service.definition.json
@@ -9,13 +9,6 @@
   "public": true,
   "sharable": "singleton",
   "requiredServices": [
-    {
-      "org": "$HZN_ORG_ID",
-      "url": "$SERVICE_NAME",
-      "version": "$SERVICE_VERSION_RANGE_UPPER",
-      "versionRange": "$SERVICE_VERSION_RANGE_LOWER",
-      "arch": "$ARCH"
-    }
   ],
   "userInput": [
     { "name": "MMS_OBJECT_TYPE", "label": "", "type": "string", "defaultValue": "$MMS_OBJECT_TYPE" },

diff --git a/build/common/src/hzn.js b/build/common/src/hzn.js
diff --git a/build/common/src/hzn.js.map b/build/common/src/hzn.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hzn-cli",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "description": "Open Horizon CLI toolkit helps streamline the process of preparing node agents and perform tasks between orgs environments",
   "main": "./build/index.js",
   "bin": {
@@ -39,7 +39,8 @@
     "MMS",
     "Model",
     "Management",
-    "Service"
+    "Service",
+    "Workload Placement"
   ],
   "author": "[email protected]",
   "license": "ISC",

diff --git a/src/common/src/hzn.ts b/src/common/src/hzn.ts
@@ -88,6 +88,7 @@ export class Hzn {
           console.log(err.message);
           this.envVar.setOrgId()
           if(err.message.indexOf('hzn:') >= 0) {
+            console.log('here:', cliBypass, cliOptional)
             if(cliBypass) {
               this.updateConfigFile()
               .subscribe(() => {

diff --git a/src/env-hzn.json b/src/env-hzn.json
@@ -2,16 +2,16 @@
   "biz": 
   {
     "envVars": {
-      "SERVICE_NAME": "saved-model-service",
-      "SERVICE_CONTAINER_NAME": "saved-model-service",
+      "SERVICE_NAME": "mms-agent",
+      "SERVICE_CONTAINER_NAME": "mms-agent",
       "SERVICE_VERSION": "1.0.0",
       "SERVICE_VERSION_RANGE_UPPER": "1.0.0",
       "SERVICE_VERSION_RANGE_LOWER": "1.0.0",
       "SERVICE_CONTAINER_CREDS": "",
       "VOLUME_MOUNT": "/mms-shared",
       "MMS_SHARED_VOLUME": "mms_shared_volume",
-      "MMS_OBJECT_TYPE": "object_detection",
-      "MMS_OBJECT_ID": "config.json",
+      "MMS_OBJECT_TYPE": "mms_agent_config",
+      "MMS_OBJECT_ID": "mms_agent_config_json",
       "MMS_OBJECT_FILE": "config/config.json",
       "MMS_CONTAINER_CREDS": "",
       "MMS_CONTAINER_NAME": "mms-service",

diff --git a/src/hzn-config/object.policy.json b/src/hzn-config/object.policy.json
@@ -3,9 +3,9 @@
     "objectType": "$MMS_OBJECT_TYPE",
     "destinationOrgID": "$HZN_ORG_ID",
     "destinationPolicy": {
-        "constrints": [
+        "constraints": [
             {
-                "name": "workersafety",
+                "name": "worker-safety",
                 "value": "Worker Safety"
             }
         ],

diff --git a/src/hzn-config/services/top-level-service/service.definition.json b/src/hzn-config/services/top-level-service/service.definition.json
@@ -9,13 +9,6 @@
   "public": true,
   "sharable": "singleton",
   "requiredServices": [
-    {
-      "org": "$HZN_ORG_ID",
-      "url": "$SERVICE_NAME",
-      "version": "$SERVICE_VERSION_RANGE_UPPER",
-      "versionRange": "$SERVICE_VERSION_RANGE_LOWER",
-      "arch": "$ARCH"
-    }
   ],
   "userInput": [
     { "name": "MMS_OBJECT_TYPE", "label": "", "type": "string", "defaultValue": "$MMS_OBJECT_TYPE" },