fixed up creating execset

Author: David Linko

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

@@ -81,12 +81,10 @@ async def report_def_by_id(agent_id: str):
             if(res):
                 ari_val = await transcoder.transcoder_put_cbor_await("ari:0x"+res.entries.hex())
                 ari_val =  ari_val['data']   
-
-        
-            addition = {'exec_set': ari_val,'correlator_nonce':correlator_nonce}
-    
+            addition = {'exec_set': ari_val,'correlator_nonce':correlator_nonce}    
             if addition not in final_res:
                 final_res.append(addition)
+
     return final_res
 
 

anms-core/anms/routes/network_manager.py

@@ -73,9 +73,11 @@ async def nm_register_agent(addr: Data):
     url = nm_url + "/agents"
     logger.info('POST to nm manager %s with addr %s' % (url, addr.data))
     try:
-        request = requests.post(url=url, data="'"+addr.data+"'", headers={'Content-Type: text/plain'} )
-    except Exception:
+        request = requests.post(url=url, data=addr.data, headers={'Content-Type': 'text/plain'} )
+    except Exception as e:
+        logger.info(e)
         return status.HTTP_500_INTERNAL_SERVER_ERROR
+    
     return request.status_code
 
 

anms-core/anms/routes/transcoder.py

@@ -104,10 +104,17 @@ async def transcoder_put_cbor_await(cbor: str):
             MQTT_CLIENT.publish("transcode/CoreFacing/Outgoing", msg)
         else:
             transcoder_log_id = curr_uri.transcoder_log_id
+            if curr_uri.parsed_as != "pending":
+                if curr_uri.parsed_as == "ERROR":
+                    curr_uri = "ARI://BADARI"
+                else:
+                    curr_uri = curr_uri.uri
+                return  {"data": curr_uri}
+
 
     while True:
         with get_session() as session:
-            curr_uri = TranscoderLog.query.filter_by(transcoder_log_id=transcoder_log_id).first()
+            curr_uri = TranscoderLog.query.filter_by(TranscoderLog.transcoder_log_id==transcoder_log_id).first()
         if curr_uri.parsed_as == "CBOR":
             curr_uri = curr_uri.uri
             break

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

@@ -96,7 +96,7 @@
       :cbor="cbor"></agents-manage-modal>
 
     <footer class="footer">
-      <p><a :href="info.split(' - ')[1]" target="_blank">Amp Version: {{ info.split(" - ")[0] }}</a></p>
+      <p><a>Amp Version: {{ info }}</a></p>
     </footer>
   </div>
 </template>
@@ -157,8 +157,8 @@ export default {
     api.methods
       .apiAmpVersion()
       .then((response) => {
-        if(response.data.amp_version_str != null){
-          vm.info = response.data.amp_version_str;
+        if(response.data.build_date != null){
+          vm.info = response.data.build_date + " " + response.data.build_time;
         }
       })
       .catch(function (error) {

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

@@ -34,7 +34,7 @@
             </b-button>
           </b-col>
           <b-col cols="9">
-            <build :cbor="cbor" :agentModal=true @updateResult="updateResults($event)"></build>
+            <build :cbor="cbor" @updateResult="updateResults($event)"></build>
           </b-col>
         </b-row>
       </div>
@@ -44,7 +44,7 @@
 <script>
 import api from "../../../shared/api.js";
 import Build from "../builder/Build.vue";
-import toastr from "toastr"
+import toastr from "toastr";
 export default {
   name: "AgentsManageModal",
   components: { Build },

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

@@ -16,7 +16,7 @@
         value="-1">-- Select Sent Reports --</b-form-select-option>
       <b-form-select-option v-for="rpt, index in rptts"
         :key="index"
-        :value="index">{{ rpt }}</b-form-select-option>
+        :value="index">{{ decodeURI(rpt) }}</b-form-select-option>
     </b-form-select>
     <b-table sticky-header
       hover

anms-ui/public/app/components/management/builder/ActionParameter.vue

@@ -66,14 +66,14 @@ export default {
       this.addToList();
     },
     addToList: function () {
+      if(this.ac.length >= this.count){
+        this.ac.pop();
+      }
 
       if (this.ariKey != null) {
         this.ac.push(this.ariKey)
       }
-
-      if(this.ac.length > this.count){
-        this.ac.pop();
-      }
+      
       this.ariKey = null;
       this.createAC();
     },

anms-ui/public/app/components/management/builder/Build.vue

@@ -21,8 +21,19 @@
         </template>
       </div>
       <template v-if="!stringMode">
+        <label>
+          <input type="checkbox" v-model="isExecutionCheck"/>
+          Execution Set?
+        </label>
+        <div v-if="isExecutionCheck">
+          <!-- <label>correlator_nonce:</label> -->
+          <b-form-input 
+          size="sm"
+          v-model="correlator_nonce"
+          @change="updateResults"/>
+          </div>
         <v-select v-model="ariKey" label="display" :options="ARIs" ></v-select>
-        <ParameterView v-if="ariKey" :ariKey="ariKey" :ACs="ARIs" :agentModal="agentModal" @updateResult="updateResults($event)"></ParameterView>
+        <ParameterView v-if="ariKey" :ariKey="ariKey" :ACs="ARIs" :nonce="correlator_nonce" @updateResult="updateResults($event)"></ParameterView>
       </template>
     </div>
   </div>
@@ -55,6 +66,8 @@ export default {
       finResultStr: undefined,
       stringMode: false,
       cborString: "",
+      correlator_nonce: undefined,
+      isExecutionCheck: false,
     }
   },
   mounted(){

anms-ui/public/app/components/management/builder/ParameterView.vue

@@ -68,7 +68,7 @@ export default {
   components: {
     vSelect,
   },
-  props: ["ariKey", "ACs", "agentModal"],
+  props: ["ariKey", "ACs", "nonce"],
   data() {
     return {
       parameters: [],
@@ -116,7 +116,6 @@ export default {
       this.submitCommand();
     },
     submitCommand() {
-    
       let testResult = [];
       if (this.ariKey.actual) {
         this.$emit("updateResult", [{ type: "/ARITYPE/OBJECT", value: this.ariKey.display }]);
@@ -214,11 +213,11 @@ export default {
             testResult +
             ")";
              // if using in agentModal adding 	ari:/EXECSET/ portion 
-          if(this.agentModal){
-            // correlator_nonce
+          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=" + nonce + ";(" + this.finResultStr +")";
+            // 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 }]);
           this.finResult = this.finResultBase;

anms-ui/public/app/components/management/builder/buildAri.vue

@@ -33,13 +33,24 @@
 
         <b-container>
           <h5>ARI Builder</h5>
+          <label>
+          <input type="checkbox" v-model="isExecutionCheck" onchange="updateNonce"/>
+          Execution Set?
+        </label>
+        <div v-if="isExecutionCheck">
+          <label>correlator_nonce:</label>
+          <b-form-input 
+          size="sm"
+          v-model="correlator_nonce"
+          @change="updateResults"/>
+          </div>
           <v-select v-model="ariKey"
             label="display"
             :options="ARIs"></v-select>
-
           <ParameterView v-if="ariKey"
             :ariKey="ariKey"
             :ACs="ARIs"
+            :nonce="correlator_nonce"
             @updateResult="updateResults($event)"></ParameterView>
 
           <div v-if="ariKey" class="text-center my-3">
@@ -98,6 +109,8 @@ export default {
       cborString: "",
       checkbox: false,
       stringMode: false,
+      correlator_nonce: undefined,
+      isExecutionCheck: false,
     };
   },
   computed: {
@@ -123,6 +136,9 @@ export default {
       reloadARIs: "reloadARIs",
       setSearchString: "setSearchString"
     }),
+    updateNonce(){
+      this.correlator_nonce = undefined;
+    },
     onSearch(search, loading) {
       if (search.length) {
         loading(true);