updated for sending and viewing execsets

Author: David Linko

anms-core/anms/routes/ARIs/ari.py

@@ -65,7 +65,7 @@ async def _generate_aris(ari_id):
 
         if ari is not None:
             if ari.parm_id is None and ari.actual: # has no paramterized 
-                display = "ari:/" + ari.namespace + "/" + ari.data_model_name + "/" + ari.type_name + "/" + ari.name
+                display = "ari://" + ari.namespace + "/" + ari.data_model_name + "/" + ari.type_name + "/" + ari.name
                 curr_ari = ari
                 curr_ari.display = display
                 curr_ari.param_names = []
@@ -83,6 +83,7 @@ async def _generate_aris(ari_id):
                     param_names = []
                     # TODO look at nested parameters 
                     for param   in formal_param.split(','):
+                        param = param.upper()    
                         param_split = param.split('/')
                         if len(param_split) > 1:
                             type_names.append('/'.join(param_split[:-1]))
@@ -92,7 +93,7 @@ async def _generate_aris(ari_id):
                     # value_set
                     a_parm_values = actual_param.value_set.decode('utf-8')
 
-                    results = "ari:/" + ari.namespace + "/"  + ari.data_model_name + "/" + ari.type_name + "/" + ari.name 
+                    results = "ari://" + ari.namespace + "/"  + ari.data_model_name + "/" + ari.type_name + "/" + ari.name 
                     if a_parm_values:
                         results = results+ "(" + a_parm_values + ")"
                     curr_ari = ari
@@ -109,14 +110,15 @@ async def _generate_aris(ari_id):
                     param_names = []
                     # TODO look at nested parameters 
                     for param   in formal_param.split(','):
+                        param = param.upper() 
                         param_split = param.split('/')
                         if len(param_split) > 1:
                             type_names.append('/'.join(param_split[:-1]))
                         else:
                             type_names.append('')
                         param_names.append(param_split[-1])
 
-                    display = "ari:/" + ari.namespace + "/" + ari.data_model_name + "/" + ari.type_name + "/" + ari.name + "(" + str(formal_param) + ")"
+                    display = "ari://" + ari.namespace + "/" + ari.data_model_name + "/" + ari.type_name + "/" + ari.name + "(" + str(formal_param) + ")"
                     curr_ari = ari
                     curr_ari.display = display
                     curr_ari.param_names = param_names
@@ -149,7 +151,7 @@ async def all_ARI():
     async with get_async_session() as session:
         result: Result = await session.scalars(stmt)
         for ari in result.all():
-            display = "ari:/"+ ari.namespace+ "/" + ari.data_model_name + "/" + ari.type_name + "/" + ari.name  if ari.parm_id is None else "ari:/" + ari.namespace+ ":" + ari.data_model_name + "/" + ari.type_name + "/" + ari.name + "(has parameters)"
+            display = "ari://"+ ari.namespace+ "/" + ari.data_model_name + "/" + ari.type_name + "/" + ari.name  if ari.parm_id is None else "ari://" + ari.namespace+ ":" + ari.data_model_name + "/" + ari.type_name + "/" + ari.name + "(has parameters)"
             curr_ari = ari
             curr_ari.display = display
             final_result.append(curr_ari)

anms-core/anms/routes/ARIs/reports.py

@@ -121,13 +121,12 @@ async def report_ac(agent_id: str, correlator_nonce: int):
     async with get_async_session() as session:
         result: Result = await session.scalars(stmt)
         for res in result.all():
-            # translate the cbor
-            logger.info(res)
-            rpt_set = res.report_list_cbor.hex()
-            rpt_set = await transcoder.transcoder_put_cbor_await("ari:0x"+rpt_set)
-            rpt_set =  rpt_set['data']   
-            logger.info(rpt_set)
-
+            # TODO translating the CBOR route might want to relook at currently cause large amount of transcoding vs just loading the string below              
+            # # translate the cbor
+            # rpt_set = res.report_list_cbor.hex()
+            # rpt_set = await transcoder.transcoder_put_cbor_await("ari:0x"+rpt_set)
+            # rpt_set =  rpt_set['data']   
+            rpt_set = res.report_list
             # match 
             # ari:/RPTSET/n=12345;r=/TP/20250611T114420.009992304Z;(t=/TD/PT0S;s=//1/1/CTRL/5(//1/1/EDD/1);(%220.0…
             rptset_pattern = r"ari:/RPTSET/n=.+;r=.*;\(t=.*;s=.*;\((.*)\)\)"

anms-core/anms/routes/network_manager.py

@@ -27,6 +27,7 @@
 
 from anms.models.relational import nm_url
 from anms.shared.opensearch_logger import OpenSearchLogger
+from urllib.parse import quote
 
 
 class Data(BaseModel):
@@ -36,7 +37,10 @@ class Data(BaseModel):
 router = APIRouter(tags=["NM"])
 logger = OpenSearchLogger(__name__, log_console=True)
 
-
+def _prepare_url(ari):
+    ari = ari.strip()
+    ari = quote(ari)
+    return ari
 
 # GET 	/version 	Return version information
 @router.get("/version", status_code=status.HTTP_200_OK)
@@ -67,9 +71,9 @@ def nm_get_agents():
 @router.post("/agents", status_code=status.HTTP_200_OK)
 async def nm_register_agent(addr: Data):
     url = nm_url + "/agents"
-    logger.info('POST to nm manager %s with addr %s' % (url, addr))
+    logger.info('POST to nm manager %s with addr %s' % (url, addr.data))
     try:
-        request = requests.post(url=url, data=addr.data)
+        request = requests.post(url=url, data="'"+addr.data+"'", headers={'Content-Type: text/plain'} )
     except Exception:
         return status.HTTP_500_INTERNAL_SERVER_ERROR
     return request.status_code
@@ -78,10 +82,10 @@ async def nm_register_agent(addr: Data):
 # PUT 	/agents/idx/{idx}/hex 	Body is CBOR-encoded HEX ARI to send. $idx is index of node from agents listing
 @router.put("/agents/idx/{idx}/hex", status_code=status.HTTP_200_OK)
 async def nm_put_hex_idx(idx: str, ari: Data):
-    url = nm_url + "/agents/idx/{}/hex".format(idx)
-    logger.info('PUT to nm manager %s  with idx %s' % (url, idx))
+    url = nm_url + "/agents/idx/{}/send?form=hex".format(idx)
+    logger.info('post to nm manager %s  with idx %s and data %s' % (url, idx, ari.data))
     try:
-        request = requests.put(url=url, data=ari.data)
+        request = requests.post(url=url, data=ari.data, headers={'Content-Type': 'text/plain'})
     except Exception:
         return status.HTTP_500_INTERNAL_SERVER_ERROR
     return request.status_code
@@ -90,10 +94,10 @@ async def nm_put_hex_idx(idx: str, ari: Data):
 # PUT 	/agents/eid/{eid}/hex 	Body is CBOR-encoded HEX ARI to send. $eid is the agent to query
 @router.put("/agents/eid/{eid}/hex", status_code=status.HTTP_200_OK)
 def nm_put_hex_eid(eid: str, ari: Data):
-    url = nm_url + "/agents/eid/{}/hex".format(eid)
-    logger.info('PUT to nm manager %s  with eid %s and data %s' % (url, eid, ari.data))
-    try:
-        request = requests.put(url=url, data=ari.data)
+    url = nm_url + "/agents/eid/{}/send?form=hex".format(_prepare_url(eid))
+    logger.info('post to nm manager %s  with eid %s and data %s' % (url, eid, ari.data))
+    try:        
+        request = requests.post(url=url, data=ari.data, headers={'Content-Type': 'text/plain'})
     except Exception:
         return status.HTTP_500_INTERNAL_SERVER_ERROR
     return request.status_code
@@ -102,7 +106,7 @@ def nm_put_hex_eid(eid: str, ari: Data):
 # PUT 	/agents/eid/{addr}/clear_reports 	Clear all reports for given node
 @router.put("/agents/eid/{addr}/clear_reports", status_code=status.HTTP_200_OK)
 async def nm_clear_reports(addr: str):
-    url = nm_url + "/agents/eid/{}/clear_reports".format(addr)
+    url = nm_url + "/agents/eid/{}/clear_reports".format(_prepare_url(addr))
     logger.info('PUT to nm manager %s with addr %s' % (url, addr))
     try:
         request = requests.put(url=url)
@@ -114,7 +118,7 @@ async def nm_clear_reports(addr: str):
 # PUT 	/agents/eid/{addr}/clear_tables 	Clear all tables for given node
 @router.put("/agents/eid/{addr}/clear_tables", status_code=status.HTTP_200_OK)
 async def nm_clear_tables(addr: str):
-    url = nm_url + "/agents/eid/{}/clear_tables".format(addr)
+    url = nm_url + "/agents/eid/{}/clear_tables".format(_prepare_url(addr))
     logger.info('PUT to nm manager %s with addr %s' % (url, addr))
     try:
         request = requests.put(url=url)
@@ -126,7 +130,7 @@ async def nm_clear_tables(addr: str):
 # GET 	/agents/eid/{addr}/reports/hex 	Retrieve list of reports for node in HEX CBOR format
 @router.get("/agents/eid/{addr}/reports/hex", status_code=status.HTTP_200_OK)
 async def nm_get_reports_hex(addr: str):
-    url = nm_url + "/agents/eid/{}/reports/hex".format(addr)
+    url = nm_url + "/agents/eid/{}/reports/hex".format(_prepare_url(addr))
     logger.info('Get to nm manger %s with addr %s' % (url, addr))
     try:
         request = requests.get(url=url)
@@ -139,7 +143,7 @@ async def nm_get_reports_hex(addr: str):
 # Retrieve list of reports for node. Currently in HEX CBOR format, but may change in future
 @router.get("/agents/eid/{addr}/reports", status_code=status.HTTP_200_OK)
 async def nm_get_reports(addr: str):
-    url = nm_url + "/agents/eid/{}/reports".format(addr)
+    url = nm_url + "/agents/eid/{}/reports".format(_prepare_url(addr))
     logger.info('GET to nm manager %s with addr %s' % (url, addr))
     try:
         request = requests.get(url=url)
@@ -151,7 +155,7 @@ async def nm_get_reports(addr: str):
 # GET 	/agents/eid/{addr}/reports/text 	Retrieve list of reports for node in ASCII/text format
 @router.get("/agents/eid/{addr}/reports/text", status_code=status.HTTP_200_OK)
 async def nm_get_reports_text(addr: str):
-    url = nm_url + "/agents/eid/{}/reports/text".format(addr)
+    url = nm_url + "/agents/eid/{}/reports/text".format(_prepare_url(addr))
     logger.info('GET to nm manager %s with addr %s' % (url, addr))
     try:
         request = requests.get(url=url)
@@ -163,7 +167,7 @@ async def nm_get_reports_text(addr: str):
 # GET 	/agents/eid/{addr}/reports/json 	Retrieve list of reports for node in JSON format
 @router.get("/agents/eid/{addr}/reports/json", status_code=status.HTTP_200_OK)
 async def nm_get_reports_json(addr: str):
-    url = nm_url + "/agents/eid/{}/reports/json".format(addr)
+    url = nm_url + "/agents/eid/{}/reports/json".format(_prepare_url(addr))
     logger.info('GET to nm manager %s with addr %s' % (url, addr))
     try:
         request = requests.get(url=url)
@@ -176,7 +180,7 @@ async def nm_get_reports_json(addr: str):
 # etrieve all reports for node. Debug information and/or multiple formats may be returned.
 @router.get("/agents/eid/{addr}/reports/debug", status_code=status.HTTP_200_OK)
 async def nm_get_reports_debug(addr: str):
-    url = nm_url + "/agents/eid/{}/reports/debug".format(addr)
+    url = nm_url + "/agents/eid/{}/reports/debug".format(_prepare_url(addr))
     logger.info('GET to nm manager %s with addr %s' % (url, addr))
     try:
         request = requests.get(url=url)
@@ -188,7 +192,7 @@ async def nm_get_reports_debug(addr: str):
 # GET 	/agents/{addr} 	Retrieve node information, including name and # reports available
 @router.get("/agents/{addr}", status_code=status.HTTP_200_OK)
 async def nm_get_agents_info(addr: str):
-    url = nm_url + "/agents/{}".format(addr)
+    url = nm_url + "/agents/{}".format(_prepare_url(addr))
     logger.info('GET to nm manager %s with addr %s' % (url, addr))
     try:
         request = requests.get(url=url)
@@ -200,7 +204,7 @@ async def nm_get_agents_info(addr: str):
 # PUT 	/agents/eid/{addr}/reports/clear 	Clear all cached reports
 @router.put("/agents/eid/{addr}/reports/clear", status_code=status.HTTP_200_OK)
 async def nm_put_clear_reports(addr: str):
-    url = nm_url + "/agents/eid/{}/reports/clear".format(addr)
+    url = nm_url + "/agents/eid/{}/reports/clear".format(_prepare_url(addr))
     logger.info('PUT to nm manager %s with addr %s' % (url, addr))
     try:
         request = requests.put(url=url)

anms-core/anms/routes/transcoder.py

@@ -124,7 +124,6 @@ async def transcoder_put_cbor_await(cbor: str):
 def transcoder_put_await_str(ari: str):
     ari = ari.strip()
     msg = json.dumps({"uri": ari})
-    logger.info(ari)
     transcoder_log_id = None
     with get_session() as session:
         curr_uri = TranscoderLog.query.filter_by(input_string=ari).first()
@@ -161,7 +160,6 @@ def transcoder_put_await_str(ari: str):
 def transcoder_put_str(ari: str):
     ari = ari.strip()
     msg = json.dumps({"uri": ari})
-    logger.info(ari)
     transcoder_log_id = None
     with get_session() as session:
         curr_uri = TranscoderLog.query.filter_by(input_string=ari).first()

anms-core/anms/shared/agent_parameter.py

@@ -129,12 +129,10 @@ def add_new_parameter(self, command):
                     logger.info(f"Agent parameter entry {command.command_name}({command.command_parameter})" +
                                 " already added updating command list")
                     prim_id = prim_id[0]
-                    logger.info(prim_id)
                 else:
                     result = db_see.execute(stmt)
                     db_see.commit()
                     prim_id = result.inserted_primary_key[0]
-                    logger.info(prim_id)
                 lock.acquire()
                 try:
                     self.agent_parameters[prim_id] = AgentParam(prim_id, command.command_name,

anms-ui/public/app/components/adm/Adm.vue

@@ -16,7 +16,7 @@
             <tr :key="index">
               <td>{{ adm.adm_enum }}</td>
               <td v-b-tooltip.hover
-                  title="Download ADM JSON" @click="download(adm)" ><b>{{ adm.adm_name }}</b></td>
+                  title="Download ADM JSON" @click="download(adm)" ><b>{{ adm.data_model_name }}</b></td>
               <td>{{ adm.name_string }}</td>
               <td>{{ adm.version_name }}</td>
               <td>{{ adm.use_desc }}</td>
@@ -125,7 +125,7 @@ export default {
         const url = URL.createObjectURL(blob);
         const link = document.createElement('a');
         link.href = url;
-        link.download = adm.adm_name +".json";
+        link.download = adm.data_model_name +".json";
         link.click();
         URL.revokeObjectURL(url);
       })

anms-ui/public/app/components/management/agents/AgentsManageModal.vue

@@ -25,7 +25,7 @@
             </div>
             <b-button block
               variant="outline-success"
-              :disabled="!ariString || this.loading"
+              :disabled="this.loading"
               @click="submitTranscodedString">
               <b-spinner v-if="this.loading"
                 small
@@ -34,7 +34,7 @@
             </b-button>
           </b-col>
           <b-col cols="9">
-            <build :cbor="cbor" @updateResult="updateResults($event)"></build>
+            <build :cbor="cbor" :agentModal=true @updateResult="updateResults($event)"></build>
           </b-col>
         </b-row>
       </div>
@@ -89,29 +89,43 @@ export default {
       this.ariString = undefined;
     },
     updateResults(result) {
-      this.ariString = result;
+      if(result.startsWith("0x")){
+        this.ariCBOR = result;
+        // submitRawCommand2Agents();
+        
+      }else{
+        this.ariString = result;
+        // submitTranscodedString();
+      }
+      
     },
     submitTranscodedString() {
       this.loading = true;
       this.sendButtonText = "Submitting ARI String";
-      api.methods
-        .apiPutTranscodedString(this.ariString)
-        .then((response) => {
-          this.transcoderLogId = response.data.id;
-          this.sendButtonText = "Transcoding ARI String";
-          this.queryTranscoderLog();
-        })
-        .catch((error) => {
-          console.error(error);
-          toastr.error(error.response.data);
-        });
+      // short circuit submitting command if already cbor 
+      if(this.ariCBOR){
+        this.submitRawCommand2Agents();
+      }
+      else{
+        api.methods
+          .apiPutTranscodedString(this.ariString)
+          .then((response) => {
+            this.transcoderLogId = response.data.id;
+            this.sendButtonText = "Transcoding ARI String";
+            this.queryTranscoderLog();
+          })
+          .catch((error) => {
+            console.error(error);
+            toastr.error(error.response.data);
+          });
+      }
     },
     queryTranscoderLog() {
       api.methods
         .apiGetTranscoderLogById(this.transcoderLogId)
         .then((response) => {
           if (response.data.parsed_as == "pending") {
-            setTimeout(() => this.queryTranscoderLog(), 5000);
+            setTimeout(() => this.queryTranscoderLog(), 8000);
           } else {
             this.ariCBOR = response.data.cbor;
             this.submitRawCommand2Agents();
@@ -139,6 +153,8 @@ export default {
       });
       this.loading = false;
       this.closeModal();
+      this.ariCBOR = null;
+      this.ariString=null;
     },
   },
 }

anms-ui/public/app/components/management/agents/crud.vue

@@ -59,7 +59,6 @@ export default {
       api.methods
         .apiPutCRUD(this.agentId, this.selected.agent_parameter_id, this.final_values)
         .then((response) => {
-          console.log(response);
           toastr.success(`${response.statusText} ${response.data}`);
           this.selected = -1;
           this.params = []