annet 0.2__tar.gz → 0.4__tar.gz

{annet-0.2/annet.egg-info → annet-0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.2
+Version: 0.4
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-0.2 → annet-0.4}/README.md

@@ -5,9 +5,9 @@ Huawei, Cisco IOS, Cisco NX-OS, Cisco IOS-XR, Juniper, as well as devices config
 
 annet has a number of modes (subcommands):
 
-- ```annet gen`` - generates the entire config for the specified devices or specified parts of it
-- ```annet diff`` - first does gen and then builds diff with current config version
-- ```annet patch`` - first does diff and then generates a list of commands to apply diff on the device
+- ```annet gen``` - generates the entire config for the specified devices or specified parts of it
+- ```annet diff``` - first does gen and then builds diff with current config version
+- ```annet patch``` - first does diff and then generates a list of commands to apply diff on the device
 
 Usage help can be obtained by calling ```annet -h``` or for a specific command, such as ```annet gen -h```.
 

{annet-0.2 → annet-0.4}/annet/annlib/netdev/devdb/__init__.py

@@ -21,7 +21,7 @@ def parse_hw_model(hw_model):
 def _prepare_db() -> Dict[str, Any]:
     try:
         from library.python import resource
-        raw = json.loads(resource.find("resfs/file/netdev/devdb/data/devdb.json").decode("utf-8"))
+        raw = json.loads(resource.resfs_read("contrib/python/annet/annet/annlib/netdev/devdb/data/devdb.json").decode("utf-8"))
     except ImportError:
         with open(path.join(path.dirname(__file__), "data", "devdb.json"), "r") as f:
             raw = json.load(f)

{annet-0.2 → annet-0.4}/annet/gen.py

@@ -704,7 +704,9 @@ def _old_new_get_config_files(ctx: OldNewDeviceContext, device: Device) -> Devic
             return old_files
         if ctx.config == "running":
             old_files_running = ctx.downloaded_files.get(device)
-            if old_files_running and old_files_running.is_empty():
+            if not old_files_running:
+                return old_files
+            if old_files_running.is_empty():
                 exc = (ctx.failed_files.get(device) or
                        Exception("I can't get device files and I don't know why"))
                 get_logger(host=device.hostname).error(str(exc))

{annet-0.2 → annet-0.4}/annet/generators/__init__.py

@@ -801,7 +801,7 @@ class Entire(BaseGenerator):
     def get_reload_cmds(self, device) -> str:
         ret = self.reload(device) or ""
         path = self.path(device)
-        if path and device.hw.PC and device.hw.soft.startswith(("Cumulus", "SwitchDev")):
+        if path and device.hw.PC and device.hw.soft.startswith(("Cumulus", "SwitchDev", "SONiC")):
             parts = []
             if ret:
                 parts.append(ret)

{annet-0.2 → annet-0.4/annet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.2
+Version: 0.4
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-0.2 → annet-0.4}/setup.py

@@ -17,7 +17,7 @@ def requirements() -> str:
 if __name__ == "__main__":
     setuptools.setup(
         name="annet",
-        version="0.2",
+        version="0.4",
         description="annet",
         license="MIT",
         url="https://github.com/annetutil/annet",