Fix bug 1904 for EPA tests (no valid hostname)

[osm/RO.git] / RO-SDN-arista_cloudvision / osm_rosdn_arista_cloudvision / aristaConfigLet.py

diff --git a/RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/aristaConfigLet.py b/RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/aristaConfigLet.py
index 8e34091..f45ec75 100644 (file)
--- a/RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/aristaConfigLet.py
+++ b/RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/aristaConfigLet.py
@@ -38,7 +38,7 @@ class AristaSDNConfigLet:
     def __init__(self, topology=_VXLAN_MLAG):\r
         self.topology = topology\r
 \r
-    _basic_int ="""\r
+    _basic_int = """\r
 interface {interface}\r
    !! service: {uuid}\r
    switchport\r
@@ -54,10 +54,10 @@ interface {interface}
             switchport_def = self._int_SRIOV.format(service=s_type, vlan_id=vlan_id)\r
         else:\r
             switchport_def = self._int_PASSTROUGH.format(vlan_id=vlan_id)\r
-        return self._basic_int.format(uuid=uuid,\r
-                                      interface=interface,\r
-                                      type=i_type,\r
-                                      switchport_def=switchport_def)\r
+\r
+        return self._basic_int.format(\r
+            uuid=uuid, interface=interface, type=i_type, switchport_def=switchport_def\r
+        )\r
 \r
     def getElan_sriov(self, uuid, interface, vlan_id, index):\r
         return self._get_interface(uuid, interface, vlan_id, "ELAN", index, "trunk")\r
@@ -66,23 +66,27 @@ interface {interface}
         return self._get_interface(uuid, interface, vlan_id, "ELINE", index, "trunk")\r
 \r
     def getElan_passthrough(self, uuid, interface, vlan_id, index):\r
-        return self._get_interface(uuid, interface, vlan_id, "ELAN", index, "dot1q-tunnel")\r
+        return self._get_interface(\r
+            uuid, interface, vlan_id, "ELAN", index, "dot1q-tunnel"\r
+        )\r
 \r
     def getEline_passthrough(self, uuid, interface, vlan_id, index):\r
-        return self._get_interface(uuid, interface, vlan_id, "ELINE", index, "dot1q-tunnel")\r
+        return self._get_interface(\r
+            uuid, interface, vlan_id, "ELINE", index, "dot1q-tunnel"\r
+        )\r
 \r
-    _basic_vlan ="""\r
+    _basic_vlan = """\r
 vlan {vlan}\r
    !! service: {service} {vlan} {uuid}\r
    name {service}{vlan}\r
    trunk group {service}{vlan}\r
 """\r
-    _basic_mlag ="""   trunk group MLAGPEER\r
+    _basic_mlag = """   trunk group MLAGPEER\r
 """\r
-    _basic_vxlan ="""interface VXLAN1\r
+    _basic_vxlan = """interface VXLAN1\r
    VXLAN vlan {vlan} vni {vni}\r
 """\r
-    _basic_end ="!"\r
+    _basic_end = "!"\r
 \r
     _configLet_VLAN = _basic_vlan + _basic_end\r
     _configLet_VXLAN = _basic_vlan + _basic_vxlan + _basic_end\r
@@ -92,12 +96,21 @@ vlan {vlan}
     def _get_vlan(self, uuid, vlan_id, vni_id, s_type):\r
         if self.topology == self._VLAN:\r
             return self._configLet_VLAN.format(service=s_type, vlan=vlan_id, uuid=uuid)\r
+\r
         if self.topology == self._VLAN_MLAG:\r
-            return self._configLet_VLAN_MLAG.format(service=s_type, vlan=vlan_id, uuid=uuid)\r
+            return self._configLet_VLAN_MLAG.format(\r
+                service=s_type, vlan=vlan_id, uuid=uuid\r
+            )\r
+\r
         if self.topology == self._VXLAN:\r
-            return self._configLet_VXLAN.format(service=s_type, vlan=vlan_id, uuid=uuid, vni=vni_id)\r
+            return self._configLet_VXLAN.format(\r
+                service=s_type, vlan=vlan_id, uuid=uuid, vni=vni_id\r
+            )\r
+\r
         if self.topology == self._VXLAN_MLAG:\r
-            return self._configLet_VXLAN_MLAG.format(service=s_type, vlan=vlan_id, uuid=uuid, vni=vni_id)\r
+            return self._configLet_VXLAN_MLAG.format(\r
+                service=s_type, vlan=vlan_id, uuid=uuid, vni=vni_id\r
+            )\r
 \r
     def getElan_vlan(self, uuid, vlan_id, vni_id):\r
         return self._get_vlan(uuid, vlan_id, vni_id, "ELAN")\r
@@ -117,12 +130,9 @@ router bgp {bgp}
 \r
     def _get_bgp(self, uuid, vlan_id, vni_id, loopback0, bgp, s_type):\r
         if self.topology == self._VXLAN or self.topology == self._VXLAN_MLAG:\r
-            return self._configLet_BGP.format(uuid=uuid,\r
-                                              bgp=bgp,\r
-                                              vlan=vlan_id,\r
-                                              loopback=loopback0,\r
-                                              vni=vni_id)\r
-\r
+            return self._configLet_BGP.format(\r
+                uuid=uuid, bgp=bgp, vlan=vlan_id, loopback=loopback0, vni=vni_id\r
+            )\r
 \r
     def getElan_bgp(self, uuid, vlan_id, vni_id, loopback0, bgp):\r
         return self._get_bgp(uuid, vlan_id, vni_id, loopback0, bgp, "ELAN")\r