version 2.0.3 - new card types including groups

QualiSystems · Apr 24, 2018 · 6a66f75 · 6a66f75
1 parent 968a85c
commit 6a66f75
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 41 deletions.
diff --git a/Ixia Chassis Shell 2G Doc.docx b/Ixia Chassis Shell 2G Doc.docx
diff --git a/IxiaChassisShell2GDriver.zip b/IxiaChassisShell2GDriver.zip
diff --git a/shell-definition.yaml b/shell-definition.yaml
@@ -2,12 +2,12 @@ description: 'Ixia chassis shell
 
   '
 imports:
-- cloudshell_standard: cloudshell_traffic_generator_chassis_standard_1_0_2.yaml
+- cloudshell_standard: cloudshell_traffic_generator_chassis_standard_1_0_3.yaml
 metadata:
   template_author: Quali
   template_icon: shell-icon.png
   template_name: Ixia Chassis Shell 2G
-  template_version: 2.0.2
+  template_version: 2.0.3
 node_types:
   vendor.Ixia Chassis Shell 2G:
     artifacts:

diff --git a/shell-definition.yml b/shell-definition.yml
diff --git a/src/ixia_handler.py b/src/ixia_handler.py
@@ -3,7 +3,6 @@
 
 from cloudshell.shell.core.driver_context import AutoLoadDetails, AutoLoadResource, AutoLoadAttribute
 
-from trafficgenerator.tgn_utils import ApiType
 from ixexplorer.ixe_app import init_ixe
 
 
@@ -26,7 +25,7 @@ def initialize(self, context, logger):
             port = '4555'
         rsa_id = path.join(path.dirname(__file__), 'id_rsa')
 
-        self.ixia = init_ixe(ApiType.socket, self.logger, host=controller_address, port=int(port), rsa_id=rsa_id)
+        self.ixia = init_ixe(self.logger, host=controller_address, port=int(port), rsa_id=rsa_id)
         self.ixia.connect()
         self.ixia.add(address)
 
@@ -95,7 +94,9 @@ def _get_port_ixos(self, card_relative_address, port_id, port):
                                     name='Port' + str(port_id),
                                     relative_address=relative_address)
         self.resources.append(resource)
-        supported_speeds = port.supported_speeds() if port.supported_speeds() else ['0']
+        supported_speeds = port.supported_speeds()
+        if not supported_speeds:
+            supported_speeds = ['0']
         self.attributes.append(AutoLoadAttribute(relative_address=relative_address,
                                                  attribute_name='CS_TrafficGeneratorPort.Max Speed',
                                                  attribute_value=int(max(supported_speeds, key=int))))

diff --git a/src/requirements.txt b/src/requirements.txt
@@ -3,5 +3,4 @@ cloudshell-automation-api>=7.0,<7.1
 cloudshell-traffic>=2.0.1
 
 paramiko==1.15.2
-pytrafficgen>=1.2.2
-pyixexplorer==0.9.4
+pyixexplorer==1.0.1
diff --git a/tests/test_ixia_chassis_driver.py b/tests/test_ixia_chassis_driver.py
@@ -13,10 +13,11 @@
 
 from src.driver import IxiaChassis2GDriver
 
-controller = ''
-port = '8022'
+controller = 'localhost'
+port = ''
 address = '192.168.42.61'
-address = '192.168.42.175'
+address = '192.168.42.217'
+address = 'localhost'
 
 
 class TestIxiaChassis2GDriver(unittest.TestCase):

diff --git a/tests/test_ixia_chassis_shell.py b/tests/test_ixia_chassis_shell.py
@@ -16,7 +16,7 @@
                              'port': '',
                              'modules': 4,
                              },
-                'lin-ixos': {'address': '192.168.42.175',
+                'lin-ixos': {'address': '192.168.42.217',
                              'controller': '',
                              'port': '8022',
                              'modules': 1,
@@ -26,7 +26,7 @@
                                          'port': '4555',
                                          'modules': 4,
                                          },
-                'lin-ixos-from-ixtcl-server': {'address': '192.168.42.175',
+                'lin-ixos-from-ixtcl-server': {'address': '192.168.42.217',
                                                'controller': 'localhost',
                                                'port': '',
                                                'modules': 1,