24.10.4 released

Author: SRBuilds

README.md

@@ -85,7 +85,7 @@ python3 setup.py install
 
 
 The pySROS libraries are available for
-[download from GitHub](https://github.com/jgcumming/pysros-examples).
+[download from GitHub](https://github.com/nokia/pysros).
 
 The obtained file can be installed using:
 

docs/source/features/24.10.rst

@@ -1,6 +1,15 @@
 Release 24.10
 *************
 
+24.10.4
+#######
+
+* No additional features
+
+.. Reviewed by PLM 20250321
+.. Reviewed by TechComms 20250321
+
+
 24.10.3
 #######
 

docs/source/index.rst

@@ -18,10 +18,9 @@ documentation will be updated accordingly.
    :header-rows: 0
 
    * - pySROS release: |pySROSProjectVersion|
-   * - Document Number: 3HE 20087 AAAH TQZZA
+   * - Document Number: 3HE 20087 AAAI TQZZA
 
-.. Reviewed by PLM 20250121
-.. Reviewed by TechComms 20250124
+.. Reviewed by PLM 20250321
 
 .. toctree::
    :maxdepth: 2

pysros/__init__.py

@@ -1,7 +1,7 @@
-# Copyright 2021-2024 Nokia
+# Copyright 2021-2025 Nokia
 
 __all__ = ("management", "exceptions", "wrappers", "pprint", )
 
 __doc__ = """Library for management of Nokia SR OS nodes."""
 
-__version__ = "24.10.3"
+__version__ = "24.10.4"

pysros/model_builder.py

@@ -631,7 +631,7 @@ def resolve_grouping(m: BuildingModel):
                 uses_children, m.children = m.children, []
                 for child in grouping.children:
                     child.deepcopy(m)
-                self.process_uses_substmts(m, uses_children)
+                process_uses_substmts(m, uses_children)
                 m.annihilate()
                 return False
         def resolve_common(m: BuildingModel, module: str):
@@ -643,7 +643,7 @@ def resolve_unresolved_prefix(m: BuildingModel):
             uses_children, m.children = m.children, []
             for child in grouping.children:
                 child.deepcopy(m).recursive_walk(resolve_unresolved_prefix)
-            self.process_uses_substmts(m, uses_children)
+            process_uses_substmts(m, uses_children, prefix_resolver=resolve_unresolved_prefix)
             m.annihilate()
             return False
         def resolve_data(m: BuildingModel):
@@ -656,24 +656,26 @@ def resolve_augment(m: BuildingModel):
             if m.data_def_stm == BuildingModel.StatementType.uses_:
                 module = augment.prefix
                 return resolve_common(m, module)
+        def process_uses_substmts(uses: BuildingModel, substmts: List[BuildingModel], *, prefix_resolver=None):
+            for m in substmts:
+                m.recursive_walk(resolve_grouping)
+                if m.data_def_stm == BuildingModel.StatementType.refine_:
+                    w = ModelWalker(uses, self._sros)
+                    m.target_path.move_walker(w, Wildcard())
+                    self.resolve_deviations_replace(w.current, m)
+                if m.data_def_stm == BuildingModel.StatementType.augment_:
+                    w = ModelWalker(uses, self._sros)
+                    m.target_path.move_walker(w, Wildcard())
+                    for i in m.children:
+                        new = i.deepcopy(w.current)
+                        if prefix_resolver:
+                            new.recursive_walk(prefix_resolver)
         for grouping in self.groupings.values():
             grouping.recursive_walk(resolve_grouping)
         self.root.recursive_walk(resolve_data)
         for augment in self.augments:
             augment.recursive_walk(resolve_augment)
 
-    def process_uses_substmts(self, uses: BuildingModel, substmts: List[BuildingModel]):
-        for m in substmts:
-            if m.data_def_stm == BuildingModel.StatementType.refine_:
-                w = ModelWalker(uses, self._sros)
-                m.target_path.move_walker(w, Wildcard())
-                self.resolve_deviations_replace(w.current, m)
-            if m.data_def_stm == BuildingModel.StatementType.augment_:
-                w = ModelWalker(uses, self._sros)
-                m.target_path.move_walker(w, Wildcard())
-                for i in m.children:
-                    i.deepcopy(w.current)
-
     def process_augment(self, m: BuildingModel):
         if m.data_def_stm == BuildingModel.StatementType.augment_:
             w = ModelWalker.path_parse(self.root, self._sros, m.target_path, True)