fixup

software/end-to-end-testing/tests/test_new_lopcomm.py

@@ -16,6 +16,7 @@ class WebsocketTestClass(e2e.EndToEndTestCase):
             cls.sim_instance_name = time.strftime('e2e-cb003-sim-new-%Y-%B-%d-%H:%M:%S')
             cls.ue_instance_name = time.strftime('e2e-sb005-ue-new-%Y-%B-%d-%H:%M:%S')
             cls.ue_cell1_instance_name = time.strftime('e2e-sb005-ue-cell1-new-%Y-%B-%d-%H:%M:%S')
+            cls.ue_sim_instance_name = time.strftime('e2e-sb005-ue-sim-new-%Y-%B-%d-%H:%M:%S')
 
             cls.product = "https://lab.nexedi.com/nexedi/slapos/-/raw/master/software/ors-amarisoft/software.cfg"
 
@@ -120,7 +121,7 @@ class WebsocketTestClass(e2e.EndToEndTestCase):
             'n_antenna_dl': 1,
             'n_antenna_ul': 1,
             'tx_gain':      -20,
-            'rx_gain':      -20,
+            'rx_gain':      -10,
             'txrx_active':  'ACTIVE',
         }
 
@@ -205,7 +206,7 @@ class WebsocketTestClass(e2e.EndToEndTestCase):
 
     @classmethod
     def setup_websocket_connection(cls):
-        #cls.waitUntilGreen(cls.ue_instance_name)
+        cls.waitUntilGreen(cls.ue_instance_name)
         cls.wait_for_attribute('ue_com_addr')
         cls.ws_url = f"ws://{cls.ue_com_addr}"
         cls.logger.info(f"Websocket URL: {cls.ws_url}")
@@ -223,28 +224,19 @@ class WebsocketTestClass(e2e.EndToEndTestCase):
     @classmethod
     def request_ue(cls):
         cls.logger.info("Request "+ cls.ue_instance_name)
-        ue_parameters = json.dumps({
-            "sim_algo": "xor",
-            "imsi": "505010123456789",
-            "k": "00112233445566778899aabbccddeeff",
-            "imeisv": "8682430000000101",
-            "impi": "505010123456789@ims.mnc505.mcc001.3gppnetwork.org",
-            "impu": ["505010123456789", "tel:0600000000", "tel:600"]
-        })
-
-        cls.retry_request(cls.request_ue_with_guid, ue_parameters)
+        cls.retry_request(cls.request_ue_with_guid)
 
     @classmethod
-    def request_ue_with_guid(cls, ue_parameters):
+    def request_ue_with_guid(cls):
         ue_instance = cls.request(cls.product, cls.ue_instance_name,
                                             filter_kw={"computer_guid": cls.comp_ue},
-                                            partition_parameter_kw={'_': ue_parameters},
                                             software_type='ue', state='started')
         if ue_instance:
             instance_infos = cls.getInstanceInfos(cls.ue_instance_name)
             cls.ue_instance_guid = instance_infos.news['instance'][0]['reference']
             cls.ue_com_addr = instance_infos.connection_dict.get('com_addr')
             cls.request_ue_cell1()
+            cls.request_ue_sim()
             return True
         return False
 
@@ -277,6 +269,26 @@ class WebsocketTestClass(e2e.EndToEndTestCase):
                         filter_kw={"instance_guid": cls.ue_instance_guid},
                         shared=True, state='started')
 
+    @classmethod
+    def request_ue_sim(cls):
+        cls.logger.info("Request "+ cls.ue_sim_instance_name)
+        ue_sim_parameters = json.dumps({
+            "ue_type": "lte",
+            "rue_addr": "2a11:9ac0:d::e41c",
+            "sim_algo": "xor",
+            "imsi": "505010123456789",
+            "k": "00112233445566778899aabbccddeeff",
+            "imeisv": "8682430000000101",
+            "impi": "505010123456789@ims.mnc505.mcc001.3gppnetwork.org",
+            "impu": ["505010123456789", "tel:0600000000", "tel:600"]
+        })
+
+        cls.retry_request(cls.request, cls.product, cls.ue_sim_instance_name,
+                        partition_parameter_kw={'_': ue_sim_parameters},
+                        software_type='ue',
+                        filter_kw={"instance_guid": cls.ue_instance_guid},
+                        shared=True, state='started')
+
     @classmethod
     def tearDownClass(cls):
         if hasattr(cls, 'ws') and cls.ws is not None: