New Dynamips integration part 3

gns3server/modules/dynamips/nios/nio_fifo.py

@@ -26,7 +26,7 @@ import logging
 log = logging.getLogger(__name__)
 
 
-class NIO_FIFO(NIO):
+class NIOFIFO(NIO):
     """
     Dynamips FIFO NIO.
 
@@ -40,8 +40,8 @@ class NIO_FIFO(NIO):
         NIO.__init__(self, hypervisor)
 
         # create an unique ID
-        self._id = NIO_FIFO._instance_count
-        NIO_FIFO._instance_count += 1
+        self._id = NIOFIFO._instance_count
+        NIOFIFO._instance_count += 1
         self._name = 'nio_fifo' + str(self._id)
 
     @classmethod

gns3server/modules/dynamips/nios/nio_generic_ethernet.py

@@ -26,7 +26,7 @@ import logging
 log = logging.getLogger(__name__)
 
 
-class NIO_GenericEthernet(NIO):
+class NIOGenericEthernet(NIO):
     """
     Dynamips generic Ethernet NIO.
 
@@ -41,8 +41,8 @@ class NIO_GenericEthernet(NIO):
         NIO.__init__(self, hypervisor)
 
         # create an unique ID
-        self._id = NIO_GenericEthernet._instance_count
-        NIO_GenericEthernet._instance_count += 1
+        self._id = NIOGenericEthernet._instance_count
+        NIOGenericEthernet._instance_count += 1
         self._name = 'nio_gen_eth' + str(self._id)
         self._ethernet_device = ethernet_device
 

gns3server/modules/dynamips/nios/nio_linux_ethernet.py

@@ -26,7 +26,7 @@ import logging
 log = logging.getLogger(__name__)
 
 
-class NIO_LinuxEthernet(NIO):
+class NIOLinuxEthernet(NIO):
     """
     Dynamips Linux Ethernet NIO.
 
@@ -41,8 +41,8 @@ class NIO_LinuxEthernet(NIO):
         NIO.__init__(self, hypervisor)
 
         # create an unique ID
-        self._id = NIO_LinuxEthernet._instance_count
-        NIO_LinuxEthernet._instance_count += 1
+        self._id = NIOLinuxEthernet._instance_count
+        NIOLinuxEthernet._instance_count += 1
         self._name = 'nio_linux_eth' + str(self._id)
         self._ethernet_device = ethernet_device
 

gns3server/modules/dynamips/nios/nio_mcast.py

@@ -26,7 +26,7 @@ import logging
 log = logging.getLogger(__name__)
 
 
-class NIO_Mcast(NIO):
+class NIOMcast(NIO):
     """
     Dynamips Linux Ethernet NIO.
 
@@ -42,8 +42,8 @@ class NIO_Mcast(NIO):
         NIO.__init__(self, hypervisor)
 
         # create an unique ID
-        self._id = NIO_Mcast._instance_count
-        NIO_Mcast._instance_count += 1
+        self._id = NIOMcast._instance_count
+        NIOMcast._instance_count += 1
         self._name = 'nio_mcast' + str(self._id)
         self._group = group
         self._port = port

gns3server/modules/dynamips/nios/nio_null.py

@@ -26,7 +26,7 @@ import logging
 log = logging.getLogger(__name__)
 
 
-class NIO_Null(NIO):
+class NIONull(NIO):
     """
     Dynamips NULL NIO.
 
@@ -40,8 +40,8 @@ class NIO_Null(NIO):
         NIO.__init__(self, hypervisor)
 
         # create an unique ID
-        self._id = NIO_Null._instance_count
-        NIO_Null._instance_count += 1
+        self._id = NIONull._instance_count
+        NIONull._instance_count += 1
         self._name = 'nio_null' + str(self._id)
 
     @classmethod

gns3server/modules/dynamips/nios/nio_tap.py

@@ -26,7 +26,7 @@ import logging
 log = logging.getLogger(__name__)
 
 
-class NIO_TAP(NIO):
+class NIOTAP(NIO):
     """
     Dynamips TAP NIO.
 
@@ -41,8 +41,8 @@ class NIO_TAP(NIO):
         NIO.__init__(self, hypervisor)
 
         # create an unique ID
-        self._id = NIO_TAP._instance_count
-        NIO_TAP._instance_count += 1
+        self._id = NIOTAP._instance_count
+        NIOTAP._instance_count += 1
         self._name = 'nio_tap' + str(self._id)
         self._tap_device = tap_device
 

gns3server/modules/dynamips/nios/nio_udp.py

@@ -26,7 +26,7 @@ import logging
 log = logging.getLogger(__name__)
 
 
-class NIO_UDP(NIO):
+class NIOUDP(NIO):
     """
     Dynamips UDP NIO.
 
@@ -43,8 +43,8 @@ class NIO_UDP(NIO):
         NIO.__init__(self, hypervisor)
 
         # create an unique ID
-        self._id = NIO_UDP._instance_count
-        NIO_UDP._instance_count += 1
+        self._id = NIOUDP._instance_count
+        NIOUDP._instance_count += 1
         self._name = 'nio_udp' + str(self._id)
         self._lport = lport
         self._rhost = rhost

gns3server/modules/dynamips/nios/nio_udp_auto.py

@@ -26,7 +26,7 @@ import logging
 log = logging.getLogger(__name__)
 
 
-class NIO_UDP_auto(NIO):
+class NIOUDPAuto(NIO):
     """
     Dynamips auto UDP NIO.
 
@@ -43,8 +43,8 @@ class NIO_UDP_auto(NIO):
         NIO.__init__(self, hypervisor)
 
         # create an unique ID
-        self._id = NIO_UDP_auto._instance_count
-        NIO_UDP_auto._instance_count += 1
+        self._id = NIOUDPAuto._instance_count
+        NIOUDPAuto._instance_count += 1
         self._name = 'nio_udp_auto' + str(self._id)
 
         self._laddr = laddr

gns3server/modules/dynamips/nios/nio_unix.py

@@ -26,7 +26,7 @@ import logging
 log = logging.getLogger(__name__)
 
 
-class NIO_UNIX(NIO):
+class NIOUNIX(NIO):
     """
     Dynamips UNIX NIO.
 
@@ -42,8 +42,8 @@ class NIO_UNIX(NIO):
         NIO.__init__(self, hypervisor)
 
         # create an unique ID
-        self._id = NIO_UNIX._instance_count
-        NIO_UNIX._instance_count += 1
+        self._id = NIOUNIX._instance_count
+        NIOUNIX._instance_count += 1
         self._name = 'nio_unix' + str(self._id)
         self._local_file = local_file
         self._remote_file = remote_file

gns3server/modules/dynamips/nios/nio_vde.py

@@ -25,7 +25,7 @@ import logging
 log = logging.getLogger(__name__)
 
 
-class NIO_VDE(NIO):
+class NIOVDE(NIO):
     """
     Dynamips VDE NIO.
 
@@ -41,8 +41,8 @@ class NIO_VDE(NIO):
         NIO.__init__(self, hypervisor)
 
         # create an unique ID
-        self._id = NIO_VDE._instance_count
-        NIO_VDE._instance_count += 1
+        self._id = NIOVDE._instance_count
+        NIOVDE._instance_count += 1
         self._name = 'nio_vde' + str(self._id)
         self._control_file = control_file
         self._local_file = local_file