fixing generaing ari with nested components

David Linko · David Linko · commit 1d7a4d7ed4a3 · 2025-07-23T16:30:13.000-04:00
diff --git a/anms-core/anms/agent_parameter.json b/anms-core/anms/agent_parameter.json
@@ -1,12 +1,2 @@
-[
-  {
-    "name": "UDP CL",
-    "parameter": ["hostname", "port"],
-    "command": [
-      "ari:/IANA:ion_bp_admin/CTRL.outduct_add(\"udp\",\"<hostname>:<port>\",\"udpclo\", 0)",
-      "ari:/IANA:ion_bp_admin/CTRL.outduct_start(\"udp\",\"<hostname>:<port>\")",
-      "ari:/IANA:ion_bp_admin/CTRL.egress_plan_add(\"<eid>\", \"udp\", \"<hostname>:<port>\")",
-      "ari:/IANA:ion_bp_admin/CTRL.egress_plan_start(\"<eid>\", \"<hostname>:<port>\")"
-    ]}
-]
+[]
 
diff --git a/anms-core/anms/routes/ARIs/reports.py b/anms-core/anms/routes/ARIs/reports.py
@@ -81,15 +81,15 @@ async def report_def_by_id(agent_id: str):
             correlator_nonce = res.correlator_nonce
             stmt = select(ExecutionSet).where(and_(ExecutionSet.agent_id == agent_id, ExecutionSet.correlator_nonce == correlator_nonce) )
             result: Result = await session.scalars(stmt)
-            res = result.one_or_none()
-            ari_val = ""
-            if(res):
-                ari_val = await transcoder.transcoder_put_cbor_await("ari:0x"+res.entries.hex())
-                logger.info(ari_val)
-                ari_val =  ari_val['data']
-                addition = {'exec_set': ari_val,'correlator_nonce':correlator_nonce}    
-                if addition not in final_res:
-                    final_res.append(addition)
+            exc_set = result.all()
+            for res in exc_set:
+                ari_val = ""
+                if(res):
+                    ari_val = await transcoder.transcoder_put_cbor_await("0x"+res.entries.hex())
+                    ari_val =  ari_val['data']
+                    addition = {'exec_set': ari_val,'correlator_nonce':correlator_nonce}    
+                    if addition not in final_res:
+                        final_res.append(addition)
 
     return final_res
 
@@ -122,7 +122,6 @@ async def report_ac(agent_id: str, correlator_nonce: int):
                 
     # current ARI should be  an exection set 
     if ari:
-        logger.info(ari)
         if type(ari.value) == ace.ari.ExecutionSet: 
             try:
                 enc = ace.ari_text.Encoder()
@@ -166,7 +165,6 @@ async def report_ac(agent_id: str, correlator_nonce: int):
                 
             # current ARI should be  an report set 
             if ari:
-                logger.info(ari)
                 if type(ari.value) == ace.ari.ReportSet:                    
                     for rpt in ari.value.reports:
                         try:
diff --git a/anms-core/anms/routes/transcoder.py b/anms-core/anms/routes/transcoder.py
@@ -98,7 +98,6 @@ async def transcoder_put_cbor_await(cbor: str):
     transcoder_log_id = None
     with get_session() as session:
         curr_uri = TranscoderLog.query.filter(or_(TranscoderLog.input_string==cbor, TranscoderLog.cbor==cbor)).first()
-
         if curr_uri is None:
             c1 = TranscoderLog(input_string=cbor, parsed_as='pending')
             session.add(c1)
diff --git a/anms-ui/public/app/components/adm/Adm.vue b/anms-ui/public/app/components/adm/Adm.vue
@@ -81,7 +81,7 @@ export default {
   data() {
     return {
       file: null,
-      allowUploadTypes: ["application/json"]
+      allowUploadTypes: ["yang"]
     };
   },
   computed: {
@@ -103,7 +103,7 @@ export default {
       return this.adms.length > 0;
     },
     hasValidFile() {
-      return (!_.isNull(this.file) && _.includes(this.allowUploadTypes, this.file.type));
+      return (!_.isNull(this.file) );
     },
   },
   async mounted() {
diff --git a/anms-ui/public/app/components/management/agents/reports.vue b/anms-ui/public/app/components/management/agents/reports.vue
@@ -33,6 +33,7 @@
 
 <script>
 import api from '../../../shared/api'
+import toastr from "toastr";
 
 export default {
   name: "reports",
@@ -66,6 +67,7 @@ export default {
           // handle error
           console.error("reports error", error);
           console.info("error obj:", error);
+          toastr.error("reports error: " + error)
         });
     
       this.loading = false;
diff --git a/anms-ui/public/app/components/management/builder/ActionParameter.vue b/anms-ui/public/app/components/management/builder/ActionParameter.vue
@@ -1,7 +1,6 @@
 <template>
   <div>
-    <label>{{name}}:</label>
-    {{ count }}
+    <label>{{name}}({{ type }}):</label>
     <div>
       <b-form-group>
         <v-select v-model="ariKey"
@@ -86,7 +85,6 @@ export default {
       let value = result[0].value;
       let head = value.includes("ari") ? "" : "ari://";
       let realIndex = this.keysRealIndex[index];
-
       this.currAc[realIndex] = head + value;
       this.submitAC();
     },
@@ -110,6 +108,7 @@ export default {
         }
       });
       this.currAc = currAc;
+      
       this.submitAC();
     },
   },
diff --git a/anms-ui/public/app/components/management/builder/ParameterView.vue b/anms-ui/public/app/components/management/builder/ParameterView.vue
@@ -80,7 +80,6 @@ export default {
     generateParameters() {
       parameter_builder.methods.genParms(this.ariKey, this.ARIs).then(response => {
         this.parameters = response[0];
-        
         this.description = response[1];
         this.finResult = response[2];
         this.finResultBase = this.finResult;
@@ -106,69 +105,72 @@ export default {
     
       let testResult = [];
       if (this.ariKey.actual) {
-        this.$emit("updateResult", [{ type: "/ARITYPE/OBJECT", value: this.ariKey.display }]);
+        this.$emit("updateResult", [{ type: "OBJECT", value: this.ariKey.display }]);
         this.finResult = this.finResultBase;
       } else {
         this.finResult.forEach((element) => {
           let type = element["type"];
           let value = element["value"];
           let currValue = [];
           switch (type) {
-            case "/ARITYPE/TEXTSTR":
-              testResult.push(encodeURIComponent(JSON.stringify(value)));
+            case "TEXTSTR":
+              testResult.push(JSON.stringify(value));
               break;
-            case "/ARITYPE/BYTESTR":
-              testResult.push(encodeURIComponent(JSON.stringify(value)));
+            case "BYTESTR":
+              testResult.push(JSON.stringify(value));
               break;
-            case "/ARITYPE/BYTE":
-              testResult.push(encodeURIComponent(JSON.stringify(value)));
+            case "BYTE":
+              testResult.push(JSON.stringify(value));
               break;
-            case "/ARITYPE/INT":
-              testResult.push(encodeURIComponent(JSON.stringify(value).replaceAll('"', "")));
+            case "INT":
+              testResult.push(JSON.stringify(value).replaceAll('"', ""));
               break;
-            case "/ARITYPE/UINT":
-              testResult.push(encodeURIComponent(JSON.stringify(value).replaceAll('"', "")));
+            case "UINT":
+              testResult.push(JSON.stringify(value).replaceAll('"', ""));
               break;
-            case "/ARITYPE/VAST":
-              testResult.push(encodeURIComponent(JSON.stringify(value).replaceAll('"', "")));
+            case "VAST":
+              testResult.push(JSON.stringify(value).replaceAll('"', ""));
               break;
-            case "/ARITYPE/UVAST":
+            case "UVAST":
               testResult.push(
-                encodeURIComponent(JSON.stringify(value).replaceAll('"', ""))
+                JSON.stringify(value).replaceAll('"', "")
               );
               break;
-            case "/ARITYPE/REAL32":
+            case "REAL32":
               testResult.push(
-                encodeURIComponent(JSON.stringify(value).replaceAll('"', ""))
+                JSON.stringify(value).replaceAll('"', "")
               );
               break;
-            case "/ARITYPE/REAL64":
+            case "REAL64":
               testResult.push(
-                encodeURIComponent(JSON.stringify(value).replaceAll('"', ""))
+                JSON.stringify(value).replaceAll('"', "")
               );
               break;
-            case "/ARITYPE/TP":
-              testResult.push(encodeURIComponent(JSON.stringify(value).replaceAll('"', "")));
+            case "TP":
+              testResult.push(JSON.stringify(value).replaceAll('"', ""));
               break;
-            case "/ARITYPE/TD":
-              testResult.push(encodeURIComponent(JSON.stringify(value).replaceAll('"', "")));
+            case "TD":
+              testResult.push(JSON.stringify(value).replaceAll('"', ""));
               break;
-            case "/ARITYPE//ARITYPE/OBJECT": //ari
+            case "OBJECT": //ari
               let head = value.includes("ari:/") ? "" : "ari://";
 
               testResult.push(JSON.stringify(head + value).replaceAll('"', ""));
               break;
-            case "/ARITYPE/AC": //ac
-              currValue = [];
+            case "AC": //ac
+            let curr_str=  ""  
+            currValue = [];
               value.forEach((ari) => {
-                currValue.push(ari.replaceAll('"', "'"));
+                currValue.push(ari.replaceAll('"', ""));
               });
-
-              testResult.push(JSON.stringify(currValue).replaceAll('"', "").replaceAll("'",'"'));
-
+              if(currValue.length = 1 ){
+                testResult.push(currValue[0])
+              }else{
+                testResult.push("/AC/("+currValue.join(",")+")");
+              }
               break;
 
-            case "/ARITYPE/EXPR": //ac
+            case "EXPR": //ac
               currValue = [];
               var parts = value.split("%")
               parts[1].split(',').forEach((ari) => {
@@ -180,8 +182,10 @@ export default {
               break;
             default:
             if (type.includes("TYPEDEF")){
-              testResult.push(JSON.stringify(ari[0]));
-            }else{testResult.push((JSON.stringify(value)));}
+              testResult.push(value[0]);
+            }else{
+              
+              testResult.push((value));}
             
             break;
           }
@@ -203,6 +207,8 @@ export default {
              // if using in agentModal adding 	ari:/EXECSET/ portion 
           if(typeof this.nonce !== 'undefined'){
             // correlator_nonc
+            // TODO currently random mayube make it increment or a choice
+            // let nonce = Math.floor(Math.random() * 99999) + 1;
             this.finResultStr = 	"ari:/EXECSET/n=" + this.nonce + ";(" + this.finResultStr +")";
           }
           this.$emit("updateResult", [{ type: "ARI", value: this.finResultStr }]);
diff --git a/anms-ui/public/app/components/management/builder/ariBuilder.js b/anms-ui/public/app/components/management/builder/ariBuilder.js
@@ -139,8 +139,8 @@ export default {
                             });
                             break;
                         case "/ARITYPE/BOOL":
-                                finResult.push({ "index": index, "type": "/ARITYPE/BOOl", "value": 0 })
-                                typeLabel = "BOOl";
+                                finResult.push({ "index": index, "type": "/ARITYPE/BOOL", "value": " " })
+                                typeLabel = "BOOL";
                                 distParms.push({
                                     type: prim_parameter,// TODO update to its own 
                                     parameter: { index: index, result: "", name: name, type: typeLabel },
@@ -156,7 +156,7 @@ export default {
                             break;
                         case "/ARITYPE/TD":
                             finResult.push({ "index": index, "type": "/ARITYPE/TD", "value": 0 });
-                            typeLabel = "TS";
+                            typeLabel = "TD";
                             distParms.push({
                                 type: prim_parameter,
                                 parameter: { index: index, result: "", name: name, type: typeLabel },
diff --git a/anms-ui/public/app/components/management/builder/primParameter.vue b/anms-ui/public/app/components/management/builder/primParameter.vue
@@ -25,7 +25,7 @@ export default {
   methods: {
     updateResults() {
       this.result["type"] = this.type;
-      this.result["value"] = this.value;
+      this.result["value"] = "/"+this.type.replace("/ARITYPE/","/")+"/"+this.value;
       this.$emit("updateResult", this.result);
     },
   },
diff --git a/anms-ui/public/app/components/management/monitor/Monitor.vue b/anms-ui/public/app/components/management/monitor/Monitor.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <!-- incoming messages  -->
-    <iframe src="/grafana/d-solo/x5LAIuA7z/agents-copy?orgId=1&from=now-48h&to=now&panelId=10" width="100%" height="250" frameborder="0"></iframe>
+    <iframe src="/grafana/d-solo/x5LAIuA7z/agents-copy?orgId=1&from=now-48h&to=now&panelId=11" width="100%" height="250" frameborder="0"></iframe>
     <!-- reports -->
         <iframe src="/grafana/d-solo/oZ7xupanz/reports?orgId=1&from=now-48h&to=now&panelId=123129" width="100%" height="250" frameborder="0"></iframe>
     <!-- aris -->
diff --git a/anms-ui/public/app/main.js b/anms-ui/public/app/main.js
@@ -70,7 +70,7 @@ Vue.prototype.$log = (() => {
 Vue.component('font-awesome-icon', FontAwesomeIcon);
 
 toastr.options.preventDuplicates = true;
-toastr.options.timeOut = 3000;
+toastr.options.timeOut = 5000;
 toastr.options.closeButton = true;
 
 // eslint-disable-next-line no-new
diff --git a/deps/test-ion-configs/mgr.rc b/deps/test-ion-configs/mgr.rc
@@ -30,13 +30,17 @@ a induct udp 0.0.0.0:4556 udpcli
 # Outducts
 a outduct udp 127.0.0.1 udpclo
 a outduct udp ION-AGENT2:4556 udpclo
+a outduct udp ION-AGENT3:4556 udpclo
+
 
 s
 ## end bpadmin
 
 ## begin ipnadmin
 a plan 1 udp/127.0.0.1
 a plan 2 udp/ION-AGENT2:4556
+a plan 3 udp/ION-AGENT3:4556
+
 
 ## end ipnadmin
 
