Commit 915ca4fb authored by Lu Xu's avatar Lu Xu 👀

fixup

parent 2eda177a
...@@ -48,7 +48,6 @@ class WebsocketTestClass(e2e.EndToEndTestCase): ...@@ -48,7 +48,6 @@ class WebsocketTestClass(e2e.EndToEndTestCase):
cls.wait_for_attribute('cn_ipv6') cls.wait_for_attribute('cn_ipv6')
cls.request_enb() cls.request_enb()
cls.request_ue() cls.request_ue()
cls.setup_websocket_connection()
@classmethod @classmethod
def retry_request(cls, func, *args, **kwargs): def retry_request(cls, func, *args, **kwargs):
...@@ -338,22 +337,47 @@ class WebsocketTestClass(e2e.EndToEndTestCase): ...@@ -338,22 +337,47 @@ class WebsocketTestClass(e2e.EndToEndTestCase):
class BBUTest(WebsocketTestClass): class BBUTest(WebsocketTestClass):
def test_ue_has_ip(self): def test_ue_has_ip(self):
result = self.recv() BBUTest.setup_websocket_connection()
result = self.ue_get() result = self.recv()
ue_id = result['ue_id'] result = self.ue_get()
ue_id = result['ue_id']
try:
self.power_on(ue_id) custom_params = {'txrx_active': 'ACTIVE'}
time.sleep(30) BBUTest.request_ru1(custom_params)
result = self.ue_get() time.sleep(180)
self.assertIn('pdn_list', result, "UE didn't connect")
self.assertIn('ipv4', result['pdn_list'][0], "UE didn't get IPv4") try:
self.logger.info("UE connected with ip: " + result['pdn_list'][0]['ipv4']) self.power_on(ue_id)
finally: time.sleep(30)
self.power_off(ue_id) result = self.ue_get()
self.logger.info(result)
self.assertIn('pdn_list', result, "UE didn't connect")
self.assertIn('ipv4', result['pdn_list'][0], "UE didn't get IPv4")
self.logger.info("UE connected with ip: " + result['pdn_list'][0]['ipv4'])
finally:
self.power_off(ue_id)
def test_txrx_inactive(self):
BBUTest.setup_websocket_connection()
result = self.recv()
result = self.ue_get()
ue_id = result['ue_id']
custom_params = {'txrx_active': 'INACTIVE'}
BBUTest.request_ru1(custom_params)
time.sleep(180)
try:
self.power_on(ue_id)
time.sleep(30)
result = self.ue_get()
self.logger.info(result)
self.assertNotIn('pdn_list', result)
finally:
self.power_off(ue_id)
def test_max_rx_sample_db(self): def test_max_rx_sample_db(self):
custom_params = {"max_rx_sample_db": -99} custom_params = {"max_rx_sample_db": -999}
BBUTest.request_enb(custom_params) BBUTest.request_enb(custom_params)
self.waitUntilPromises(BBUTest.enb_instance_name, promise_name=BBUTest.eru1_instance_name + "-rx-saturated", expected=False) self.waitUntilPromises(BBUTest.enb_instance_name, promise_name=BBUTest.eru1_instance_name + "-rx-saturated", expected=False)
...@@ -366,7 +390,6 @@ class BBUTest(WebsocketTestClass): ...@@ -366,7 +390,6 @@ class BBUTest(WebsocketTestClass):
current_time = datetime.now() current_time = datetime.now()
future_time = current_time + timedelta(minutes=1) future_time = current_time + timedelta(minutes=1)
reset_crontab_time = f"{future_time.minute} {future_time.hour} * * *" reset_crontab_time = f"{future_time.minute} {future_time.hour} * * *"
self.logger.info("Reset crontab time:", reset_crontab_time)
custom_params = {"reset_schedule": reset_crontab_time} custom_params = {"reset_schedule": reset_crontab_time}
BBUTest.request_ru1(custom_params) BBUTest.request_ru1(custom_params)
......
...@@ -48,7 +48,6 @@ class WebsocketTestClass(e2e.EndToEndTestCase): ...@@ -48,7 +48,6 @@ class WebsocketTestClass(e2e.EndToEndTestCase):
cls.wait_for_attribute('cn_ipv6') cls.wait_for_attribute('cn_ipv6')
cls.request_enb() cls.request_enb()
cls.request_ue() cls.request_ue()
cls.setup_websocket_connection()
@classmethod @classmethod
def retry_request(cls, func, *args, **kwargs): def retry_request(cls, func, *args, **kwargs):
...@@ -338,22 +337,47 @@ class WebsocketTestClass(e2e.EndToEndTestCase): ...@@ -338,22 +337,47 @@ class WebsocketTestClass(e2e.EndToEndTestCase):
class BBUTest(WebsocketTestClass): class BBUTest(WebsocketTestClass):
def test_ue_has_ip(self): def test_ue_has_ip(self):
result = self.recv() BBUTest.setup_websocket_connection()
result = self.ue_get() result = self.recv()
ue_id = result['ue_id'] result = self.ue_get()
ue_id = result['ue_id']
try:
self.power_on(ue_id) custom_params = {'txrx_active': 'ACTIVE'}
time.sleep(30) BBUTest.request_ru1(custom_params)
result = self.ue_get() time.sleep(180)
self.assertIn('pdn_list', result, "UE didn't connect")
self.assertIn('ipv4', result['pdn_list'][0], "UE didn't get IPv4") try:
self.logger.info("UE connected with ip: " + result['pdn_list'][0]['ipv4']) self.power_on(ue_id)
finally: time.sleep(30)
self.power_off(ue_id) result = self.ue_get()
self.logger.info(result)
self.assertIn('pdn_list', result, "UE didn't connect")
self.assertIn('ipv4', result['pdn_list'][0], "UE didn't get IPv4")
self.logger.info("UE connected with ip: " + result['pdn_list'][0]['ipv4'])
finally:
self.power_off(ue_id)
def test_txrx_inactive(self):
BBUTest.setup_websocket_connection()
result = self.recv()
result = self.ue_get()
ue_id = result['ue_id']
custom_params = {'txrx_active': 'INACTIVE'}
BBUTest.request_ru1(custom_params)
time.sleep(180)
try:
self.power_on(ue_id)
time.sleep(30)
result = self.ue_get()
self.logger.info(result)
self.assertNotIn('pdn_list', result)
finally:
self.power_off(ue_id)
def test_max_rx_sample_db(self): def test_max_rx_sample_db(self):
custom_params = {"max_rx_sample_db": -99} custom_params = {"max_rx_sample_db": -999}
BBUTest.request_enb(custom_params) BBUTest.request_enb(custom_params)
self.waitUntilPromises(BBUTest.enb_instance_name, promise_name=BBUTest.eru1_instance_name + "-rx-saturated", expected=False) self.waitUntilPromises(BBUTest.enb_instance_name, promise_name=BBUTest.eru1_instance_name + "-rx-saturated", expected=False)
...@@ -366,7 +390,6 @@ class BBUTest(WebsocketTestClass): ...@@ -366,7 +390,6 @@ class BBUTest(WebsocketTestClass):
current_time = datetime.now() current_time = datetime.now()
future_time = current_time + timedelta(minutes=1) future_time = current_time + timedelta(minutes=1)
reset_crontab_time = f"{future_time.minute} {future_time.hour} * * *" reset_crontab_time = f"{future_time.minute} {future_time.hour} * * *"
self.logger.info("Reset crontab time:", reset_crontab_time)
custom_params = {"reset_schedule": reset_crontab_time} custom_params = {"reset_schedule": reset_crontab_time}
BBUTest.request_ru1(custom_params) BBUTest.request_ru1(custom_params)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment