Merge pull request #165 from shurick2/main

feat: add h3c

annet/adapters/netbox/common/manufacturer.py

@@ -17,7 +17,8 @@
     "aruba": "Aruba",
     "routeros": "RouterOS",
     "ribbon": "Ribbon",
-    "b4com": "B4com"
+    "b4com": "B4com",
+    "h3c": "H3C",
 }
 
 
@@ -37,6 +38,8 @@ def get_breed(manufacturer: str, model: str):
         return "vrp85"
     elif manufacturer == "Huawei":
         return "vrp55"
+    elif manufacturer == "H3C":
+        return "h3c"
     elif manufacturer in ("Mellanox", "NVIDIA"):
         return "cuml2"
     elif manufacturer == "Juniper":

annet/annlib/rbparser/platform.py

@@ -1,5 +1,6 @@
 VENDOR_REVERSES = {
     "huawei": "undo",
+    "h3c": "undo",
     "optixtrans": "undo",
     "cisco": "no",
     "nexus": "no",
@@ -45,6 +46,7 @@
 
 VENDOR_EXIT = {
     "huawei": "quit",
+    "h3c": "quit",
     "optixtrans": "quit",
     "cisco": "exit",
     "nexus": "exit",
@@ -57,3 +59,7 @@
     "ribbon": "exit",
     "b4com": "exit",
 }
+
+VENDOR_ALIASES = {
+    "h3c": "huawei",
+}

annet/annlib/rulebook/common.py

@@ -356,6 +356,10 @@ def apply(hw, do_commit, do_finalize, **_):
             after.add_cmd(Command("commit"))
         if do_finalize:
             after.add_cmd(Command("write", timeout=40))
+    elif hw.H3C:
+        before.add_cmd(Command("system-view"))
+        if do_finalize:
+            after.add_cmd(Command("save force", timeout=20))
     else:
         raise Exception("unknown hw %s" % hw)
 

annet/rulebook/__init__.py

@@ -5,7 +5,7 @@
 
 from annet.annlib.lib import mako_render
 from annet.annlib.rbparser.ordering import compile_ordering_text
-from annet.annlib.rbparser.platform import VENDOR_REVERSES
+from annet.annlib.rbparser.platform import VENDOR_REVERSES, VENDOR_ALIASES
 
 from annet.connectors import CachedConnector
 from annet.rulebook.deploying import compile_deploying_text
@@ -64,7 +64,8 @@ def get_rulebook(self, hw):
             return self._rulebook_cache[hw]
 
         assert hw.vendor in VENDOR_REVERSES, "Unknown vendor: %s" % (hw.vendor)
-        patching = compile_patching_text(self._render_rul(hw.vendor + ".rul", hw), hw.vendor)
+        rul_vendor_name = VENDOR_ALIASES.get(hw.vendor, hw.vendor)
+        patching = compile_patching_text(self._render_rul(rul_vendor_name + ".rul", hw), rul_vendor_name)
 
         try:
             ordering_text = self._render_rul(hw.vendor + ".order", hw)

annet/tabparser.py

@@ -33,6 +33,8 @@ def make_formatter(hw, **kwargs):
         cls = CommonFormatter
     elif hw.Ribbon:
         cls = RibbonFormatter
+    elif hw.H3C:
+        cls = HuaweiFormatter
     else:
         raise NotImplementedError("Unknown formatter for hw '%s'" % hw)
 

tests/__init__.py

@@ -55,6 +55,7 @@ def make_hw_stub(vendor):
         "ribbon": "Ribbon",
         "optixtrans": "Huawei DC",
         "b4com": "B4com",
+        "h3c": "H3C",
     }[vendor], None)
 
 

tests/annet/test_api.py

@@ -31,7 +31,7 @@
         id="juniper-ribbon"
     ),
     pytest.param(
-        {"huawei"},
+        {"huawei", "h3c"},
         """
         port split mode mode1 slot 1
         ip vpn-instance MEth0/0/0