Merge remote-tracking branch 'origin/main' into 38-anms_fun_bld_007-edds-ari-selection-on-build-tab

Author: David Linko

.env

@@ -53,4 +53,4 @@ ION_MGR_PORT=8089
 HTTP_PORT:80
 SOCKDIR=/var/tmp/nm
 
-ADM_PATH=deps/dtnma-ace/tests/adms
+ADM_PATH=deps/dtnma-adms

.gitmodules

@@ -9,3 +9,6 @@
 [submodule "deps/dtnma-camp"]
 	path = deps/dtnma-camp
 	url = https://github.com/JHUAPL-DTNMA/dtnma-camp.git
+[submodule "deps/dtnma-adms"]
+	path = deps/dtnma-adms
+	url = https://github.com/JHUAPL-DTNMA/dtnma-adms.git

anms-core/Dockerfile

@@ -39,7 +39,7 @@ COPY anms ${APP_WORK_DIR}/anms
 RUN ${PIP} install ${APP_WORK_DIR}
 
 RUN mkdir -p /usr/local/share/ace && \
-    cp -R /usr/src/dtnma-ace/tests/adms /usr/local/share/ace/adms
+    cp -R /usr/src/dtnma-adms /usr/local/share/ace/adms
 COPY anms/agent_parameter.json /usr/local/share/anms/agent_parameter.json
 
 RUN setcap cap_net_raw=ep /usr/bin/ping

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/adms/adm_compare.py

@@ -49,10 +49,7 @@ def compare_adms(self, old_adm: ace.models.AdmModule, new_adm: ace.models.AdmMod
       ['const', ace.models.Const, self.compare_const],
       ['ctrl', ace.models.Ctrl, self.compare_ctrl],
       ['edd', ace.models.Edd, self.compare_edd],
-      ['mac', ace.models.Mac, self.compare_mac],
       ['oper', ace.models.Oper, self.compare_oper],
-      ['rptt', ace.models.Rptt, self.compare_rptt],
-      ['tblt', ace.models.Tblt, self.compare_tblt],
       ['var', ace.models.Var, self.compare_var],
     ]
 
@@ -105,32 +102,21 @@ def _compare_tnl(self, old_obj, new_obj, attrname):
 
   def compare_const(self, old_obj, new_obj):
     self._compare_attr(old_obj, new_obj, 'enum')
-    self._compare_attr(old_obj, new_obj, 'type')
+    self._compare_attr(old_obj, new_obj, 'typeobj')
 
   def compare_ctrl(self, old_obj, new_obj):
     self._compare_attr(old_obj, new_obj, 'enum')
 
   def compare_edd(self, old_obj, new_obj):
     self._compare_attr(old_obj, new_obj, 'enum')
-    self._compare_attr(old_obj, new_obj, 'type')
+    self._compare_attr(old_obj, new_obj, 'typeobj')
 
-  def compare_mac(self, old_obj, new_obj):
-    self._compare_attr(old_obj, new_obj, 'enum')
-    # The action doesn't affect the manager
 
   def compare_oper(self, old_obj, new_obj):
     self._compare_attr(old_obj, new_obj, 'enum')
     # The result_type and in_type don't affect the manager
 
-  def compare_rptt(self, old_obj, new_obj):
-    self._compare_attr(old_obj, new_obj, 'enum')
-    self._compare_ac(old_obj, new_obj, 'definition')
-
-  def compare_tblt(self, old_obj, new_obj):
-    self._compare_attr(old_obj, new_obj, 'enum')
-    self._compare_tnl(old_obj, new_obj, 'columns')
-
   def compare_var(self, old_obj, new_obj):
     self._compare_attr(old_obj, new_obj, 'enum')
-    self._compare_attr(old_obj, new_obj, 'type')
+    self._compare_attr(old_obj, new_obj, 'typeobj')
     # The initializer doesn't affect the manager

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/pyproject.toml

@@ -31,8 +31,6 @@ dependencies = [
   "email-validator ~=1.3",
   "fastapi ~=0.86.0",
   "fastapi-pagination ~=0.9.1",
-  "grpcio ~=1.50.0",
-  "grpcio-tools ~=1.50.0",
   "gunicorn ~=23.0.0",
   "httpx ~=0.24.0",
   "itsdangerous ~=2.1.2",

anms-core/test/anms/routes/adms/test_adm.py

@@ -32,7 +32,7 @@
 from anms.shared.config_utils import ConfigBuilder
 from anms.shared.opensearch_logger import OpenSearchLogger
 from unittest.mock import (patch, MagicMock, AsyncMock, PropertyMock)
-from anms.components.schemas.adm import NamespaceViewSchema
+from anms.components.schemas.adm import DataModelSchema
 
 from fastapi import File, UploadFile, Request
 
@@ -57,18 +57,19 @@ def __init__(self):
 
 class TestAdm:
     @pytest.mark.anyio
-    @patch('anms.routes.adms.adm.NamespaceView', new_callable=AsyncMock)
-    async def test_getall(self, mock_namespace_view):
+    @patch('anms.routes.adms.adm.DataModel', new_callable=AsyncMock)
+    async def test_getall(self, mock_datamodel_view):
         '''
         This only test the flow of the getall function.
         The actual execution is not tested due to no access to database
         '''
+
         #This mock the getall method of Adm that is used inside the getall function
         mock_result = [
-            NamespaceViewSchema(enumeration=1, data_model_name="amp", 
-                name_string="amp/agent", version_name="v3.1", use_des="view result")
+            DataModelSchema(data_model_id=0, enumeration=1, name="dtnma-agent",  
+                 version_name="v3.1", namespace_type='adm', use_des="Updated for latest ADM document.")
         ]
-        mock_namespace_view.getall.return_value = mock_result
+        mock_datamodel_view.getall.return_value = mock_result
         res = await getall()
         '''
             Ideally, the res is a JSONResponse object. Yet, fastapi
@@ -78,7 +79,7 @@ async def test_getall(self, mock_namespace_view):
         assert res == mock_result
 
     @pytest.mark.anyio
-    @patch('anms.routes.adms.adm.NamespaceView', new_callable=AsyncMock)
+    @patch('anms.routes.adms.adm.DataModel', new_callable=AsyncMock)
     async def test_getall_empty(self, mock_adm):
         '''
         This test the result when there is no data or the function is failed

anms-core/test/anms/routes/adms/test_adm_compare.py

@@ -52,8 +52,9 @@ def _load_adm(self, filename):
 
     def test_equal(self):
         comp = AdmCompare(self._admset)
-        adm1 = self._load_adm('test_adm_reference.json')
-        adm2 = self._load_adm('test_adm_reference.json')
+        self._load_adm('ietf-amm.yang')
+        adm1 = self._load_adm('example-adm-minimal.yang')
+        adm2 = self._load_adm('example-adm-minimal.yang')
         assert comp.compare_adms(adm1, adm2)
         assert [] == comp.get_errors()
 
@@ -66,15 +67,17 @@ def compare_error(self, errorA, errorB):
 
     def test_different(self):
         comp = AdmCompare(self._admset)
-        adm1 = self._load_adm('test_adm_reference.json')
-        adm2 = self._load_adm('test_adm_modified.json')
+        self._load_adm('ietf-amm.yang')
+        adm1 = self._load_adm('example-adm-minimal.yang')
+        adm2 = self._load_adm('example-adm-minimal-modified.yang')
         assert not comp.compare_adms(adm1, adm2)
         expect_errors = [
             {'obj_type': 'Edd',
             'name': 'edd1',
-            'issue':'changed type value from INT to REAL32'
+            'issue': "changed typeobj value from TypeUse(type_text='/ARITYPE/int', type_ari=LiteralARI(value=<StructType.INT: 4>, type_id=<StructType.ARITYPE: 16>), base=None, units=None, constraints=[]) to TypeUse(type_text='/ARITYPE/real32', type_ari=LiteralARI(value=<StructType.REAL32: 8>, type_id=<StructType.ARITYPE: 16>), base=None, units=None, constraints=[])"
             }
         ]
+        
         for actual_error in comp.get_errors():
             has_equivalent_error = False
             for expect_error in expect_errors:

anms-core/test/anms/routes/adms/test_data/example-adm-minimal-modified.yang

@@ -0,0 +1,37 @@
+module example-adm-minimal {
+  namespace "ari://example/adm-minimal/";
+  prefix test;
+
+  import ietf-amm {
+    prefix amm;
+  }
+
+  organization "example" {
+    amm:enum 65535;
+  }
+  revision 2023-10-31 {
+    description
+      "Initial test";
+  }
+  amm:enum 0;
+
+  amm:edd edd1 {
+    amm:enum 1;
+    description
+      "EDD test_int";
+    amm:type /ARITYPE/real32;
+  }
+  amm:ctrl test1 {
+    amm:enum 1;
+    description
+      "This control resets all Agent ADM statistics reported in the Agent ADM report.";
+    amm:parameter id {
+      description "one";
+      amm:type "//ietf/amm/TYPEDEF/any";
+    }
+    amm:parameter def {
+      description "two";
+      amm:type "//ietf/amm/TYPEDEF/expr";
+    }
+  }
+}