fix ce modules functions

plugins/action/ce.py

@@ -17,7 +17,7 @@
 
 display = Display()
 
-CLI_SUPPORTED_MODULES = ['ce_rollback', 'ce_mlag_interface', 'ce_startup', 'ce_config',
+CLI_SUPPORTED_MODULES = ['ce_rollback', 'ce_startup', 'ce_config',
                          'ce_command', 'ce_facts', 'ce_evpn_global', 'ce_evpn_bgp_rr',
                          'ce_mtu', 'ce_evpn_bgp', 'ce_snmp_location', 'ce_snmp_contact',
                          'ce_snmp_traps', 'ce_netstream_global', 'ce_netstream_aging',

plugins/modules/network/cloudengine/ce_aaa_server.py

@@ -657,7 +657,6 @@
       <radius xmlns="http://www.huawei.com/netconf/vrp" content-version="1.0" format-version="1.0">
         <rdsClient>
           <isEnable></isEnable>
-          <coaEnable></coaEnable>
           <authClientIdentifier></authClientIdentifier>
         </rdsClient>
       </radius>

plugins/modules/network/cloudengine/ce_bfd_session.py

@@ -263,6 +263,12 @@ def get_interface_type(interface):
         iftype = '40ge'
     elif interface.upper().startswith('100GE'):
         iftype = '100ge'
+    elif interface.upper().startswith('50GE'):
+        iftype = '50ge'
+    elif interface.upper().startswith('200GE'):
+        iftype = '200ge'
+    elif interface.upper().startswith('400GE'):
+        iftype = '400ge'
     elif interface.upper().startswith('VLANIF'):
         iftype = 'vlanif'
     elif interface.upper().startswith('LOOPBACK'):

plugins/modules/network/cloudengine/ce_dldp_interface.py

@@ -279,6 +279,12 @@ def get_interface_type(interface):
         iftype = '40ge'
     elif interface.upper().startswith('100GE'):
         iftype = '100ge'
+    elif interface.upper().startswith('50GE'):
+        iftype = '50ge'
+    elif interface.upper().startswith('200GE'):
+        iftype = '200ge'
+    elif interface.upper().startswith('400GE'):
+        iftype = '400ge'
     elif interface.upper().startswith('VLANIF'):
         iftype = 'vlanif'
     elif interface.upper().startswith('LOOPBACK'):

plugins/modules/network/cloudengine/ce_eth_trunk.py

@@ -251,6 +251,12 @@ def get_interface_type(interface):
         iftype = '40ge'
     elif interface.upper().startswith('100GE'):
         iftype = '100ge'
+    elif interface.upper().startswith('50GE'):
+        iftype = '50ge'
+    elif interface.upper().startswith('200GE'):
+        iftype = '200ge'
+    elif interface.upper().startswith('400GE'):
+        iftype = '400ge'
     elif interface.upper().startswith('VLANIF'):
         iftype = 'vlanif'
     elif interface.upper().startswith('LOOPBACK'):

plugins/modules/network/cloudengine/ce_evpn_bgp.py

@@ -215,11 +215,6 @@ def __init__(self, argument_spec):
         self.advertise_l2vpn_evpn = self.module.params['advertise_l2vpn_evpn']
         self.state = self.module.params['state']
 
-        # host info
-        self.host = self.module.params['host']
-        self.username = self.module.params['username']
-        self.port = self.module.params['port']
-
         # state
         self.config = ""
         self.config_list = list()

plugins/modules/network/cloudengine/ce_interface.py

@@ -284,6 +284,12 @@ def get_interface_type(interface):
         return '40ge'
     elif interface.upper().startswith('100GE'):
         return '100ge'
+    elif interface.upper().startswith('50GE'):
+        iftype = '50ge'
+    elif interface.upper().startswith('200GE'):
+        iftype = '200ge'
+    elif interface.upper().startswith('400GE'):
+        iftype = '400ge'
     elif interface.upper().startswith('VLANIF'):
         return 'vlanif'
     elif interface.upper().startswith('LOOPBACK'):

plugins/modules/network/cloudengine/ce_interface_ospf.py

@@ -295,6 +295,12 @@ def get_interface_type(interface):
         return '40ge'
     elif interface.upper().startswith('100GE'):
         return '100ge'
+    elif interface.upper().startswith('50GE'):
+        iftype = '50ge'
+    elif interface.upper().startswith('200GE'):
+        iftype = '200ge'
+    elif interface.upper().startswith('400GE'):
+        iftype = '400ge'
     elif interface.upper().startswith('VLANIF'):
         return 'vlanif'
     elif interface.upper().startswith('LOOPBACK'):

plugins/modules/network/cloudengine/ce_ip_interface.py

@@ -313,6 +313,12 @@ def get_interface_type(interface):
         return '40ge'
     elif interface.upper().startswith('100GE'):
         return '100ge'
+    elif interface.upper().startswith('50GE'):
+        iftype = '50ge'
+    elif interface.upper().startswith('200GE'):
+        iftype = '200ge'
+    elif interface.upper().startswith('400GE'):
+        iftype = '400ge'
     elif interface.upper().startswith('VLANIF'):
         return 'vlanif'
     elif interface.upper().startswith('LOOPBACK'):

plugins/modules/network/cloudengine/ce_is_is_interface.py

@@ -408,6 +408,12 @@ def get_interface_type(interface):
         return '40ge'
     elif interface.upper().startswith('100GE'):
         return '100ge'
+    elif interface.upper().startswith('50GE'):
+        iftype = '50ge'
+    elif interface.upper().startswith('200GE'):
+        iftype = '200ge'
+    elif interface.upper().startswith('400GE'):
+        iftype = '400ge'
     elif interface.upper().startswith('VLANIF'):
         return 'vlanif'
     elif interface.upper().startswith('LOOPBACK'):

plugins/modules/network/cloudengine/ce_is_is_view.py

@@ -1006,6 +1006,12 @@ def get_interface_type(interface):
         iftype = '40ge'
     elif interface.upper().startswith('100GE'):
         iftype = '100ge'
+    elif interface.upper().startswith('50GE'):
+        iftype = '50ge'
+    elif interface.upper().startswith('200GE'):
+        iftype = '200ge'
+    elif interface.upper().startswith('400GE'):
+        iftype = '400ge'
     elif interface.upper().startswith('VLANIF'):
         iftype = 'vlanif'
     elif interface.upper().startswith('LOOPBACK'):

plugins/modules/network/cloudengine/ce_link_status.py

@@ -207,6 +207,12 @@ def get_interface_type(interface):
         return '40ge'
     elif interface.upper().startswith('100GE'):
         return '100ge'
+    elif interface.upper().startswith('50GE'):
+        iftype = '50ge'
+    elif interface.upper().startswith('200GE'):
+        iftype = '200ge'
+    elif interface.upper().startswith('400GE'):
+        iftype = '400ge'
     elif interface.upper().startswith('VLANIF'):
         return 'vlanif'
     elif interface.upper().startswith('LOOPBACK'):

plugins/modules/network/cloudengine/ce_lldp_interface.py

@@ -485,6 +485,12 @@ def get_interface_type(interface):
         iftype = '40ge'
     elif interface.upper().startswith('100GE'):
         iftype = '100ge'
+    elif interface.upper().startswith('50GE'):
+        iftype = '50ge'
+    elif interface.upper().startswith('200GE'):
+        iftype = '200ge'
+    elif interface.upper().startswith('400GE'):
+        iftype = '400ge'
     elif interface.upper().startswith('PORT-GROUP'):
         iftype = 'stack-Port'
     elif interface.upper().startswith('NULL'):

plugins/modules/network/cloudengine/ce_mdn_interface.py

@@ -170,6 +170,12 @@ def get_interface_type(interface):
         iftype = '40ge'
     elif interface.upper().startswith('100GE'):
         iftype = '100ge'
+    elif interface.upper().startswith('50GE'):
+        iftype = '50ge'
+    elif interface.upper().startswith('200GE'):
+        iftype = '200ge'
+    elif interface.upper().startswith('400GE'):
+        iftype = '400ge'
     elif interface.upper().startswith('PORT-GROUP'):
         iftype = 'stack-Port'
     elif interface.upper().startswith('NULL'):

plugins/modules/network/cloudengine/ce_mlag_config.py

@@ -171,6 +171,22 @@
 </dfs>
 </filter>
 """
+
+CE_NC_GET_DFS_GROUP_EXC_TRILL_INFO = """
+<filter type="subtree">
+<dfs xmlns="http://www.huawei.com/netconf/vrp" content-version="1.0" format-version="1.0">
+  <groupInstances>
+    <groupInstance>
+      <groupId></groupId>
+      <priority></priority>
+      <ipAddress></ipAddress>
+      <srcVpnName></srcVpnName>
+    </groupInstance>
+  </groupInstances>
+</dfs>
+</filter>
+"""
+
 CE_NC_GET_PEER_LINK_INFO = """
 <filter type="subtree">
 <mlag xmlns="http://www.huawei.com/netconf/vrp" content-version="1.0" format-version="1.0">
@@ -357,7 +373,9 @@ def get_dfs_group_info(self):
         """ get dfs group attributes info."""
 
         dfs_group_info = dict()
-        conf_str = CE_NC_GET_DFS_GROUP_INFO
+        for tmp in ["groupId", "priority", "ipAddress", "srcVpnName", "localNickname", "pseudoNickname", "pseudoPriority"]:
+            dfs_group_info[tmp] = None
+        conf_str = CE_NC_GET_DFS_GROUP_EXC_TRILL_INFO
         xml_str = get_nc_config(self.module, conf_str)
         if "<data/>" in xml_str:
             return dfs_group_info

plugins/modules/network/cloudengine/ce_mlag_interface.py

@@ -309,6 +309,12 @@ def get_interface_type(interface):
         iftype = '40ge'
     elif interface.upper().startswith('100GE'):
         iftype = '100ge'
+    elif interface.upper().startswith('50GE'):
+        iftype = '50ge'
+    elif interface.upper().startswith('200GE'):
+        iftype = '200ge'
+    elif interface.upper().startswith('400GE'):
+        iftype = '400ge'
     elif interface.upper().startswith('ETH-TRUNK'):
         iftype = 'eth-trunk'
     elif interface.upper().startswith('NULL'):

plugins/modules/network/cloudengine/ce_mtu.py

@@ -157,6 +157,12 @@ def is_interface_support_setjumboframe(interface):
         support_flag = True
     elif interface.upper().startswith('100GE'):
         support_flag = True
+    elif interface.upper().startswith('50GE'):
+        support_flag = True
+    elif interface.upper().startswith('200GE'):
+        support_flag = True
+    elif interface.upper().startswith('400GE'):
+        support_flag = True
     else:
         support_flag = False
     return support_flag
@@ -182,6 +188,12 @@ def get_interface_type(interface):
         iftype = '40ge'
     elif interface.upper().startswith('100GE'):
         iftype = '100ge'
+    elif interface.upper().startswith('50GE'):
+        iftype = '50ge'
+    elif interface.upper().startswith('200GE'):
+        iftype = '200ge'
+    elif interface.upper().startswith('400GE'):
+        iftype = '400ge'
     elif interface.upper().startswith('VLANIF'):
         iftype = 'vlanif'
     elif interface.upper().startswith('LOOPBACK'):

plugins/modules/network/cloudengine/ce_netstream_aging.py

@@ -215,11 +215,6 @@ def __init__(self, argument_spec):
         self.timeout_type = self.module.params['timeout_type']
         self.manual_slot = self.module.params['manual_slot']
 
-        # host info
-        self.host = self.module.params['host']
-        self.username = self.module.params['username']
-        self.port = self.module.params['port']
-
         # state
         self.changed = False
         self.updates_cmd = list()

plugins/modules/network/cloudengine/ce_netstream_global.py

@@ -240,6 +240,12 @@ def get_interface_type(interface):
         iftype = '40ge'
     elif interface.upper().startswith('100GE'):
         iftype = '100ge'
+    elif interface.upper().startswith('50GE'):
+        iftype = '50ge'
+    elif interface.upper().startswith('200GE'):
+        iftype = '200ge'
+    elif interface.upper().startswith('400GE'):
+        iftype = '400ge'
     elif interface.upper().startswith('ETH-TRUNK'):
         iftype = 'eth-trunk'
     elif interface.upper().startswith('ALL'):

plugins/modules/network/cloudengine/ce_ntp.py

@@ -213,6 +213,12 @@ def get_interface_type(interface):
         iftype = '40ge'
     elif interface.upper().startswith('100GE'):
         iftype = '100ge'
+    elif interface.upper().startswith('50GE'):
+        iftype = '50ge'
+    elif interface.upper().startswith('200GE'):
+        iftype = '200ge'
+    elif interface.upper().startswith('400GE'):
+        iftype = '400ge'
     elif interface.upper().startswith('VLANIF'):
         iftype = 'vlanif'
     elif interface.upper().startswith('LOOPBACK'):

plugins/modules/network/cloudengine/ce_sflow.py

@@ -303,6 +303,12 @@ def get_interface_type(interface):
         iftype = '40ge'
     elif interface.upper().startswith('100GE'):
         iftype = '100ge'
+    elif interface.upper().startswith('50GE'):
+        iftype = '50ge'
+    elif interface.upper().startswith('200GE'):
+        iftype = '200ge'
+    elif interface.upper().startswith('400GE'):
+        iftype = '400ge'
     elif interface.upper().startswith('VLANIF'):
         iftype = 'vlanif'
     elif interface.upper().startswith('LOOPBACK'):

plugins/modules/network/cloudengine/ce_switchport.py

@@ -239,6 +239,12 @@ def get_interface_type(interface):
         iftype = '40ge'
     elif interface.upper().startswith('100GE'):
         iftype = '100ge'
+    elif interface.upper().startswith('50GE'):
+        iftype = '50ge'
+    elif interface.upper().startswith('200GE'):
+        iftype = '200ge'
+    elif interface.upper().startswith('400GE'):
+        iftype = '400ge'
     elif interface.upper().startswith('VLANIF'):
         iftype = 'vlanif'
     elif interface.upper().startswith('LOOPBACK'):

plugins/modules/network/cloudengine/ce_vrf_interface.py

@@ -230,6 +230,12 @@ def get_interface_type(interface):
         iftype = '40ge'
     elif interface.upper().startswith('100GE'):
         iftype = '100ge'
+    elif interface.upper().startswith('50GE'):
+        iftype = '50ge'
+    elif interface.upper().startswith('200GE'):
+        iftype = '200ge'
+    elif interface.upper().startswith('400GE'):
+        iftype = '400ge'
     elif interface.upper().startswith('VLANIF'):
         iftype = 'vlanif'
     elif interface.upper().startswith('LOOPBACK'):

plugins/modules/network/cloudengine/ce_vrrp.py

@@ -392,6 +392,12 @@ def get_interface_type(interface):
         iftype = '40ge'
     elif interface.upper().startswith('100GE'):
         iftype = '100ge'
+    elif interface.upper().startswith('50GE'):
+        iftype = '50ge'
+    elif interface.upper().startswith('200GE'):
+        iftype = '200ge'
+    elif interface.upper().startswith('400GE'):
+        iftype = '400ge'
     elif interface.upper().startswith('ETH-TRUNK'):
         iftype = 'eth-trunk'
     elif interface.upper().startswith('NULL'):

plugins/modules/network/cloudengine/ce_vxlan_arp.py

@@ -238,11 +238,6 @@ def __init__(self, argument_spec):
         self.arp_suppress = self.module.params['arp_suppress']
         self.state = self.module.params['state']
 
-        # host info
-        self.host = self.module.params['host']
-        self.username = self.module.params['username']
-        self.port = self.module.params['port']
-
         # state
         self.config = ""  # current config
         self.changed = False

plugins/modules/network/cloudengine/ce_vxlan_gateway.py

@@ -351,11 +351,6 @@ def __init__(self, argument_spec):
         self.arp_direct_route = self.module.params['arp_direct_route']
         self.state = self.module.params['state']
 
-        # host info
-        self.host = self.module.params['host']
-        self.username = self.module.params['username']
-        self.port = self.module.params['port']
-
         # state
         self.config = ""  # current config
         self.changed = False

plugins/modules/network/cloudengine/ce_vxlan_vap.py

@@ -373,6 +373,12 @@ def get_interface_type(interface):
         iftype = '40ge'
     elif interface.upper().startswith('100GE'):
         iftype = '100ge'
+    elif interface.upper().startswith('50GE'):
+        iftype = '50ge'
+    elif interface.upper().startswith('200GE'):
+        iftype = '200ge'
+    elif interface.upper().startswith('400GE'):
+        iftype = '400ge'
     elif interface.upper().startswith('VLANIF'):
         iftype = 'vlanif'
     elif interface.upper().startswith('LOOPBACK'):