Added ability to set mirror usage point postRate

Fixed FSA results

Author: craig8

ieee_2030_5/adapters/__init__.py

@@ -95,7 +95,10 @@ def fetch_by_property(self, prop: str, prop_value: Any) -> Optional[T]:
         for obj in self._item_list.values():
             if getattr(obj, prop) == prop_value:
                 return obj
-        
+            
+    def fetch_child_names(self) -> List[str]:
+        return list(self._child_prefix.keys())
+    
     def add_container(self, child_type: Type, href_prefix: str):
         self._child_prefix[child_type] = href_prefix
 

ieee_2030_5/adapters/enddevices.py

@@ -106,7 +106,7 @@ def initialize_end_device_adapter(sender):
             # fsa = FSAAdapter.create(fsa_programs)
             # edev.FunctionSetAssignmentsListLink = m.FunctionSetAssignmentsListLink(href=hrefs.fsa_href(edev_index=index))
             # self._fsa.append(fsa)
-            EndDeviceAdapter.add_replace_child(edev, hrefs.FSA, fsa)
+            EndDeviceAdapter.add_replace_child(edev, hrefs.FSA, FSAAdapter)
 
         if dev.ders:
             der_href = hrefs.EdevHref(index, hrefs.EDevSubType.DER)

ieee_2030_5/adapters/mupupt.py

@@ -4,7 +4,7 @@
 
 import ieee_2030_5.hrefs as hrefs
 import ieee_2030_5.models as m
-from ieee_2030_5.adapters import ReturnCode
+from ieee_2030_5.adapters import BaseAdapter, ReturnCode
 from ieee_2030_5.data.indexer import add_href, get_href
 
 _log = logging.getLogger(__name__)
@@ -142,7 +142,6 @@ def fetch_by_mRID(self, mRID: str) -> m.UsagePoint:
 
     def _fetch_wrapper_by_mRID(self, mRID: str) -> _UsagePointWrapper:
         for x in self.__usage_points__:
-            print(f"Comparing {x.usage_point.mRID} to {mRID}")
             if x.usage_point.mRID == mRID:
                 return x
 
@@ -194,7 +193,7 @@ def fetch_usage_point_by_href(self, href: str) -> m.UsagePoint:
 
     def fetch_mirror_usage_point_list(self, start=0, after=0, limit=1) -> m.MirrorUsagePointList:
         return m.MirrorUsagePointList(href=hrefs.mirror_usage_point_href(), all=len(self.__mirror_usage_points__), results=len(self.__mirror_usage_points__),
-                                      MirrorUsagePoint=self.__mirror_usage_points__)
+                                      MirrorUsagePoint=self.__mirror_usage_points__, pollRate=BaseAdapter.server_config().usage_point_post_rate)
 
     def fetch_mirror_usage_by_href(self, href) -> m.MirrorUsagePoint:
         return next(filter(lambda x: x.href == href, self.__mirror_usage_points__))
@@ -234,6 +233,7 @@ def create(self, mup: m.MirrorUsagePoint) -> Tuple[ReturnCode, str]:
         if after > before:
             # TODO: Don't hard code here.
             mup.href = upt.href.replace('upt', 'mup')
+            mup.postRate = BaseAdapter.server_config().usage_point_post_rate
             self.__mirror_usage_points__.append(mup)
             return ReturnCode.CREATED.value, mup.href
         else:

ieee_2030_5/config.py

@@ -165,6 +165,7 @@ class ServerConfiguration:
 
     log_event_list_poll_rate: int = 900
     device_capability_poll_rate: int = 900
+    usage_point_post_rate: int = 300
     end_device_list_poll_rate: int = 86400  # daily check-in
 
     generate_admin_cert: bool = False

ieee_2030_5/server/admin_endpoints.py

@@ -5,6 +5,7 @@
 
 import ieee_2030_5.hrefs as hrefs
 import ieee_2030_5.models as m
+from ieee_2030_5.adapters import Adapter
 from ieee_2030_5.adapters.der import DERProgramAdapter
 from ieee_2030_5.adapters.enddevices import EndDeviceAdapter
 from ieee_2030_5.adapters.fsa import FSAAdapter
@@ -33,6 +34,8 @@ def __init__(self, app: Flask, tls_repo: TLSRepository, config: ServerConfigurat
         app.add_url_rule("/admin/edev/<int:edevid>/fsa/<int:fsaid>", view_func=self._admin_edev_fsa)
         app.add_url_rule("/admin/edev/<int:edevid>/fsa", view_func=self._admin_edev_fsa)
         app.add_url_rule("/admin/edev/<int:edevid>/der", view_func=self._admin_edev_ders)
+        app.add_url_rule("/admin/edev/<int:edevid>/der/<int:derid>/current_derp", view_func=self._admin_edev_ders)
+        app.add_url_rule("/admin/edev/<int:edevid>/der/<int:derid>", view_func=self._admin_edev_ders)
         app.add_url_rule("/admin/edev", view_func=self._admin_edev)
         # END COMPLETE
 
@@ -55,11 +58,19 @@ def __init__(self, app: Flask, tls_repo: TLSRepository, config: ServerConfigurat
     def _admin_edev(self) -> Response:
         return Response(dataclass_to_xml(EndDeviceAdapter.fetch_all(m.EndDeviceList())))
 
-    def _admin_edev_ders(self, edevid: int) -> Response:
+    def _admin_edev_ders(self, edevid: int, derid: int = None) -> Response:
         ed = EndDeviceAdapter.fetch(edevid)
-        deradpter = EndDeviceAdapter.fetch_child(ed, hrefs.DER)
+        deradpter: Adapter[m.DER] = EndDeviceAdapter.fetch_child(ed, hrefs.DER)
+        if derid:
+            retval: m.DER = deradpter.fetch(derid)
+            if request.path.endswith('current_derp'):
+                derp_href = hrefs.DERProgramHref.parse(retval.CurrentDERProgramLink)
+                retval = DERProgramAdapter.fetch(derp_href.index)
+        else:
+            retval = deradpter.fetch_all(m.DERList())
+            
 
-        return Response(dataclass_to_xml(deradpter.fetch_all(m.DERList())))
+        return Response(dataclass_to_xml(retval))
 
     def _admin_edev_fsa(self, edevid: int, fsaid: int = -1) -> Response:
         if edevid > -1 and fsaid > -1:
@@ -99,7 +110,7 @@ def _admin_der_update_current_derp(self, edev_index: int, der_index: int):
             else:
                 program = DERProgramAdapter.create(data).data
                 response_status = 201
-            
+            print(EndDeviceAdapter.fetch_child_names())
             der = DERAdapter.fetch_at(edev_index, der_index)
             der.CurrentDERProgramLink = m.CurrentDERProgramLink(program.href)
             return Response(dataclass_to_xml(program), status=response_status)
@@ -210,7 +221,7 @@ def _admin(self) -> Response:
 
     def _admin_enddevices(self, index:int = None) -> Response:
 
-        return Response(dataclass_to_xml(EndDeviceAdapter.fetch_list()))
+        return Response(dataclass_to_xml(EndDeviceAdapter.fetch_all(m.EndDeviceList())))
 
     def _lfdi_lists(self) -> Response:
         items = []

ieee_2030_5/server/enddevicesfs.py

@@ -121,7 +121,13 @@ def get(self) -> Response:
 
         elif edev_href.edev_subtype is hrefs.EDevSubType.FunctionSetAssignments:
 
-            raise ValueError("FSA ???")
+            fsaadpt: FSAAdapter = EndDeviceAdapter.fetch_child(ed, hrefs.FSA, edev_href.edev_index)
+            
+            if edev_href.edev_subtype_index == hrefs.NO_INDEX:
+                retval = fsaadpt.fetch_all(m.FunctionSetAssignmentsList(href=request.path), start=start, after=after, limit=limit)
+            else:
+                retval = fsaadpt.fetch(edev_href.edev_subtype_index)
+                
 
             # if edev_href.edev_subtype_index == hrefs.NO_INDEX:
             #     retval = EndDeviceAdapter.fetch_children(m.DERList(request.path), hrefs.DERSubType)