Skip to content

slapos
slapos
Commit 2373ab7e authored by Joanne Hugé's avatar Joanne Hugé
Browse files
Options

software/ors-amarisoft: update tests with new parameters

parent 637e7eae
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 21 deletions
software/ors-amarisoft/test/test.jinja2.py
View file @ 2373ab7e
...@@ -53,6 +53,7 @@ param_dict = { ...@@ -53,6 +53,7 @@ param_dict = {
'n_rb_dl': 50, 'n_rb_dl': 50,
'enb_id': '0x17', 'enb_id': '0x17',
'pci': 250, 'pci': 250,
'tac': '0x1717',
'mme_list': { 'mme_list': {
'10.0.0.1': {'mme_addr': '10.0.0.1'}, '10.0.0.1': {'mme_addr': '10.0.0.1'},
'2001:db8::1': {'mme_addr': '2001:db8::1'}, '2001:db8::1': {'mme_addr': '2001:db8::1'},
...@@ -119,8 +120,8 @@ gnb_param_dict1 = { ...@@ -119,8 +120,8 @@ gnb_param_dict1 = {
} }
gnb_param_dict2 = { gnb_param_dict2 = {
'nssai': { 'nssai': {
'1': {'sd': 1, 'sst': 10}, '0x171717': {'sd': '0x171717', 'sst': 10},
'2': {'sd': 2, 'sst': 20}, '0x181818': {'sd': '0x181818', 'sst': 20},
}, },
} }
enb_param_dict.update(param_dict) enb_param_dict.update(param_dict)
...@@ -140,6 +141,7 @@ def test_enb_conf(self): ...@@ -140,6 +141,7 @@ def test_enb_conf(self):
self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn']) self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn'])
self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16)) self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16))
self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci']) self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci'])
self.assertEqual(conf['cell_list'][0]['tac'], enb_param_dict['tac'])
for p in conf['cell_list'][0]['plmn_list']: for p in conf['cell_list'][0]['plmn_list']:
for n in "plmn attach_without_pdn reserved".split(): for n in "plmn attach_without_pdn reserved".split():
self.assertEqual(p[n], enb_param_dict['plmn_list'][p['plmn']][n]) self.assertEqual(p[n], enb_param_dict['plmn_list'][p['plmn']][n])
...@@ -209,7 +211,7 @@ def test_gnb_conf2(self): ...@@ -209,7 +211,7 @@ def test_gnb_conf2(self):
for p in conf['nr_cell_default']['plmn_list'][0]['nssai']: for p in conf['nr_cell_default']['plmn_list'][0]['nssai']:
for n in "sd sst".split(): for n in "sd sst".split():
self.assertEqual(p[n], gnb_param_dict2['nssai'][str(p['sd'])][n]) self.assertEqual(p[n], gnb_param_dict2['nssai'][p['sd']][n])
def test_mme_conf(self): def test_mme_conf(self):
......
software/ors-amarisoft/test/testFDD.py
View file @ 2373ab7e
...@@ -53,6 +53,7 @@ param_dict = { ...@@ -53,6 +53,7 @@ param_dict = {
'n_rb_dl': 50, 'n_rb_dl': 50,
'enb_id': '0x17', 'enb_id': '0x17',
'pci': 250, 'pci': 250,
'tac': '0x1717',
'mme_list': { 'mme_list': {
'10.0.0.1': {'mme_addr': '10.0.0.1'}, '10.0.0.1': {'mme_addr': '10.0.0.1'},
'2001:db8::1': {'mme_addr': '2001:db8::1'}, '2001:db8::1': {'mme_addr': '2001:db8::1'},
...@@ -119,8 +120,8 @@ gnb_param_dict1 = { ...@@ -119,8 +120,8 @@ gnb_param_dict1 = {
} }
gnb_param_dict2 = { gnb_param_dict2 = {
'nssai': { 'nssai': {
'1': {'sd': 1, 'sst': 10}, '0x171717': {'sd': '0x171717', 'sst': 10},
'2': {'sd': 2, 'sst': 20}, '0x181818': {'sd': '0x181818', 'sst': 20},
}, },
} }
enb_param_dict.update(param_dict) enb_param_dict.update(param_dict)
...@@ -140,6 +141,7 @@ def test_enb_conf(self): ...@@ -140,6 +141,7 @@ def test_enb_conf(self):
self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn']) self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn'])
self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16)) self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16))
self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci']) self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci'])
self.assertEqual(conf['cell_list'][0]['tac'], enb_param_dict['tac'])
for p in conf['cell_list'][0]['plmn_list']: for p in conf['cell_list'][0]['plmn_list']:
for n in "plmn attach_without_pdn reserved".split(): for n in "plmn attach_without_pdn reserved".split():
self.assertEqual(p[n], enb_param_dict['plmn_list'][p['plmn']][n]) self.assertEqual(p[n], enb_param_dict['plmn_list'][p['plmn']][n])
...@@ -209,7 +211,7 @@ def test_gnb_conf2(self): ...@@ -209,7 +211,7 @@ def test_gnb_conf2(self):
for p in conf['nr_cell_default']['plmn_list'][0]['nssai']: for p in conf['nr_cell_default']['plmn_list'][0]['nssai']:
for n in "sd sst".split(): for n in "sd sst".split():
self.assertEqual(p[n], gnb_param_dict2['nssai'][str(p['sd'])][n]) self.assertEqual(p[n], gnb_param_dict2['nssai'][p['sd']][n])
def test_mme_conf(self): def test_mme_conf(self):
......
software/ors-amarisoft/test/testTDD.py
View file @ 2373ab7e
...@@ -53,6 +53,7 @@ param_dict = { ...@@ -53,6 +53,7 @@ param_dict = {
'n_rb_dl': 50, 'n_rb_dl': 50,
'enb_id': '0x17', 'enb_id': '0x17',
'pci': 250, 'pci': 250,
'tac': '0x1717',
'mme_list': { 'mme_list': {
'10.0.0.1': {'mme_addr': '10.0.0.1'}, '10.0.0.1': {'mme_addr': '10.0.0.1'},
'2001:db8::1': {'mme_addr': '2001:db8::1'}, '2001:db8::1': {'mme_addr': '2001:db8::1'},
...@@ -119,8 +120,8 @@ gnb_param_dict1 = { ...@@ -119,8 +120,8 @@ gnb_param_dict1 = {
} }
gnb_param_dict2 = { gnb_param_dict2 = {
'nssai': { 'nssai': {
'1': {'sd': 1, 'sst': 10}, '0x171717': {'sd': '0x171717', 'sst': 10},
'2': {'sd': 2, 'sst': 20}, '0x181818': {'sd': '0x181818', 'sst': 20},
}, },
} }
enb_param_dict.update(param_dict) enb_param_dict.update(param_dict)
...@@ -140,6 +141,7 @@ def test_enb_conf(self): ...@@ -140,6 +141,7 @@ def test_enb_conf(self):
self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn']) self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn'])
self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16)) self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16))
self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci']) self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci'])
self.assertEqual(conf['cell_list'][0]['tac'], enb_param_dict['tac'])
for p in conf['cell_list'][0]['plmn_list']: for p in conf['cell_list'][0]['plmn_list']:
for n in "plmn attach_without_pdn reserved".split(): for n in "plmn attach_without_pdn reserved".split():
self.assertEqual(p[n], enb_param_dict['plmn_list'][p['plmn']][n]) self.assertEqual(p[n], enb_param_dict['plmn_list'][p['plmn']][n])
...@@ -209,7 +211,7 @@ def test_gnb_conf2(self): ...@@ -209,7 +211,7 @@ def test_gnb_conf2(self):
for p in conf['nr_cell_default']['plmn_list'][0]['nssai']: for p in conf['nr_cell_default']['plmn_list'][0]['nssai']:
for n in "sd sst".split(): for n in "sd sst".split():
self.assertEqual(p[n], gnb_param_dict2['nssai'][str(p['sd'])][n]) self.assertEqual(p[n], gnb_param_dict2['nssai'][p['sd']][n])
def test_mme_conf(self): def test_mme_conf(self):
......
software/ors-amarisoft/test/testTDD1900.py
View file @ 2373ab7e
...@@ -53,6 +53,7 @@ param_dict = { ...@@ -53,6 +53,7 @@ param_dict = {
'n_rb_dl': 50, 'n_rb_dl': 50,
'enb_id': '0x17', 'enb_id': '0x17',
'pci': 250, 'pci': 250,
'tac': '0x1717',
'mme_list': { 'mme_list': {
'10.0.0.1': {'mme_addr': '10.0.0.1'}, '10.0.0.1': {'mme_addr': '10.0.0.1'},
'2001:db8::1': {'mme_addr': '2001:db8::1'}, '2001:db8::1': {'mme_addr': '2001:db8::1'},
...@@ -119,8 +120,8 @@ gnb_param_dict1 = { ...@@ -119,8 +120,8 @@ gnb_param_dict1 = {
} }
gnb_param_dict2 = { gnb_param_dict2 = {
'nssai': { 'nssai': {
'1': {'sd': 1, 'sst': 10}, '0x171717': {'sd': '0x171717', 'sst': 10},
'2': {'sd': 2, 'sst': 20}, '0x181818': {'sd': '0x181818', 'sst': 20},
}, },
} }
enb_param_dict.update(param_dict) enb_param_dict.update(param_dict)
...@@ -140,6 +141,7 @@ def test_enb_conf(self): ...@@ -140,6 +141,7 @@ def test_enb_conf(self):
self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn']) self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn'])
self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16)) self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16))
self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci']) self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci'])
self.assertEqual(conf['cell_list'][0]['tac'], enb_param_dict['tac'])
for p in conf['cell_list'][0]['plmn_list']: for p in conf['cell_list'][0]['plmn_list']:
for n in "plmn attach_without_pdn reserved".split(): for n in "plmn attach_without_pdn reserved".split():
self.assertEqual(p[n], enb_param_dict['plmn_list'][p['plmn']][n]) self.assertEqual(p[n], enb_param_dict['plmn_list'][p['plmn']][n])
...@@ -209,7 +211,7 @@ def test_gnb_conf2(self): ...@@ -209,7 +211,7 @@ def test_gnb_conf2(self):
for p in conf['nr_cell_default']['plmn_list'][0]['nssai']: for p in conf['nr_cell_default']['plmn_list'][0]['nssai']:
for n in "sd sst".split(): for n in "sd sst".split():
self.assertEqual(p[n], gnb_param_dict2['nssai'][str(p['sd'])][n]) self.assertEqual(p[n], gnb_param_dict2['nssai'][p['sd']][n])
def test_mme_conf(self): def test_mme_conf(self):
......
software/ors-amarisoft/test/testTDD2600.py
View file @ 2373ab7e
...@@ -53,6 +53,7 @@ param_dict = { ...@@ -53,6 +53,7 @@ param_dict = {
'n_rb_dl': 50, 'n_rb_dl': 50,
'enb_id': '0x17', 'enb_id': '0x17',
'pci': 250, 'pci': 250,
'tac': '0x1717',
'mme_list': { 'mme_list': {
'10.0.0.1': {'mme_addr': '10.0.0.1'}, '10.0.0.1': {'mme_addr': '10.0.0.1'},
'2001:db8::1': {'mme_addr': '2001:db8::1'}, '2001:db8::1': {'mme_addr': '2001:db8::1'},
...@@ -119,8 +120,8 @@ gnb_param_dict1 = { ...@@ -119,8 +120,8 @@ gnb_param_dict1 = {
} }
gnb_param_dict2 = { gnb_param_dict2 = {
'nssai': { 'nssai': {
'1': {'sd': 1, 'sst': 10}, '0x171717': {'sd': '0x171717', 'sst': 10},
'2': {'sd': 2, 'sst': 20}, '0x181818': {'sd': '0x181818', 'sst': 20},
}, },
} }
enb_param_dict.update(param_dict) enb_param_dict.update(param_dict)
...@@ -140,6 +141,7 @@ def test_enb_conf(self): ...@@ -140,6 +141,7 @@ def test_enb_conf(self):
self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn']) self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn'])
self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16)) self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16))
self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci']) self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci'])
self.assertEqual(conf['cell_list'][0]['tac'], enb_param_dict['tac'])
for p in conf['cell_list'][0]['plmn_list']: for p in conf['cell_list'][0]['plmn_list']:
for n in "plmn attach_without_pdn reserved".split(): for n in "plmn attach_without_pdn reserved".split():
self.assertEqual(p[n], enb_param_dict['plmn_list'][p['plmn']][n]) self.assertEqual(p[n], enb_param_dict['plmn_list'][p['plmn']][n])
...@@ -209,7 +211,7 @@ def test_gnb_conf2(self): ...@@ -209,7 +211,7 @@ def test_gnb_conf2(self):
for p in conf['nr_cell_default']['plmn_list'][0]['nssai']: for p in conf['nr_cell_default']['plmn_list'][0]['nssai']:
for n in "sd sst".split(): for n in "sd sst".split():
self.assertEqual(p[n], gnb_param_dict2['nssai'][str(p['sd'])][n]) self.assertEqual(p[n], gnb_param_dict2['nssai'][p['sd']][n])
def test_mme_conf(self): def test_mme_conf(self):
......
software/ors-amarisoft/test/testTDD3500.py
View file @ 2373ab7e
...@@ -53,6 +53,7 @@ param_dict = { ...@@ -53,6 +53,7 @@ param_dict = {
'n_rb_dl': 50, 'n_rb_dl': 50,
'enb_id': '0x17', 'enb_id': '0x17',
'pci': 250, 'pci': 250,
'tac': '0x1717',
'mme_list': { 'mme_list': {
'10.0.0.1': {'mme_addr': '10.0.0.1'}, '10.0.0.1': {'mme_addr': '10.0.0.1'},
'2001:db8::1': {'mme_addr': '2001:db8::1'}, '2001:db8::1': {'mme_addr': '2001:db8::1'},
...@@ -119,8 +120,8 @@ gnb_param_dict1 = { ...@@ -119,8 +120,8 @@ gnb_param_dict1 = {
} }
gnb_param_dict2 = { gnb_param_dict2 = {
'nssai': { 'nssai': {
'1': {'sd': 1, 'sst': 10}, '0x171717': {'sd': '0x171717', 'sst': 10},
'2': {'sd': 2, 'sst': 20}, '0x181818': {'sd': '0x181818', 'sst': 20},
}, },
} }
enb_param_dict.update(param_dict) enb_param_dict.update(param_dict)
...@@ -140,6 +141,7 @@ def test_enb_conf(self): ...@@ -140,6 +141,7 @@ def test_enb_conf(self):
self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn']) self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn'])
self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16)) self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16))
self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci']) self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci'])
self.assertEqual(conf['cell_list'][0]['tac'], enb_param_dict['tac'])
for p in conf['cell_list'][0]['plmn_list']: for p in conf['cell_list'][0]['plmn_list']:
for n in "plmn attach_without_pdn reserved".split(): for n in "plmn attach_without_pdn reserved".split():
self.assertEqual(p[n], enb_param_dict['plmn_list'][p['plmn']][n]) self.assertEqual(p[n], enb_param_dict['plmn_list'][p['plmn']][n])
...@@ -209,7 +211,7 @@ def test_gnb_conf2(self): ...@@ -209,7 +211,7 @@ def test_gnb_conf2(self):
for p in conf['nr_cell_default']['plmn_list'][0]['nssai']: for p in conf['nr_cell_default']['plmn_list'][0]['nssai']:
for n in "sd sst".split(): for n in "sd sst".split():
self.assertEqual(p[n], gnb_param_dict2['nssai'][str(p['sd'])][n]) self.assertEqual(p[n], gnb_param_dict2['nssai'][p['sd']][n])
def test_mme_conf(self): def test_mme_conf(self):
......
software/ors-amarisoft/test/testTDD3700.py
View file @ 2373ab7e
...@@ -53,6 +53,7 @@ param_dict = { ...@@ -53,6 +53,7 @@ param_dict = {
'n_rb_dl': 50, 'n_rb_dl': 50,
'enb_id': '0x17', 'enb_id': '0x17',
'pci': 250, 'pci': 250,
'tac': '0x1717',
'mme_list': { 'mme_list': {
'10.0.0.1': {'mme_addr': '10.0.0.1'}, '10.0.0.1': {'mme_addr': '10.0.0.1'},
'2001:db8::1': {'mme_addr': '2001:db8::1'}, '2001:db8::1': {'mme_addr': '2001:db8::1'},
...@@ -119,8 +120,8 @@ gnb_param_dict1 = { ...@@ -119,8 +120,8 @@ gnb_param_dict1 = {
} }
gnb_param_dict2 = { gnb_param_dict2 = {
'nssai': { 'nssai': {
'1': {'sd': 1, 'sst': 10}, '0x171717': {'sd': '0x171717', 'sst': 10},
'2': {'sd': 2, 'sst': 20}, '0x181818': {'sd': '0x181818', 'sst': 20},
}, },
} }
enb_param_dict.update(param_dict) enb_param_dict.update(param_dict)
...@@ -140,6 +141,7 @@ def test_enb_conf(self): ...@@ -140,6 +141,7 @@ def test_enb_conf(self):
self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn']) self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn'])
self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16)) self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16))
self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci']) self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci'])
self.assertEqual(conf['cell_list'][0]['tac'], enb_param_dict['tac'])
for p in conf['cell_list'][0]['plmn_list']: for p in conf['cell_list'][0]['plmn_list']:
for n in "plmn attach_without_pdn reserved".split(): for n in "plmn attach_without_pdn reserved".split():
self.assertEqual(p[n], enb_param_dict['plmn_list'][p['plmn']][n]) self.assertEqual(p[n], enb_param_dict['plmn_list'][p['plmn']][n])
...@@ -209,7 +211,7 @@ def test_gnb_conf2(self): ...@@ -209,7 +211,7 @@ def test_gnb_conf2(self):
for p in conf['nr_cell_default']['plmn_list'][0]['nssai']: for p in conf['nr_cell_default']['plmn_list'][0]['nssai']:
for n in "sd sst".split(): for n in "sd sst".split():
self.assertEqual(p[n], gnb_param_dict2['nssai'][str(p['sd'])][n]) self.assertEqual(p[n], gnb_param_dict2['nssai'][p['sd']][n])
def test_mme_conf(self): def test_mme_conf(self):
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7