Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Roque
slapos
Commits
558b5655
Commit
558b5655
authored
Mar 31, 2023
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Plain Diff
ors-amarisoft fix the random test failing when accessing ors IPv6 with dynamic port
See merge request
nexedi/slapos!1378
parents
e5cd611c
1f716750
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
6 additions
and
91 deletions
+6
-91
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+3
-3
software/ors-amarisoft/instance-enb-epc.jinja2.cfg
software/ors-amarisoft/instance-enb-epc.jinja2.cfg
+1
-1
software/ors-amarisoft/instance-epc.jinja2.cfg
software/ors-amarisoft/instance-epc.jinja2.cfg
+1
-1
software/ors-amarisoft/instance-gnb-epc.jinja2.cfg
software/ors-amarisoft/instance-gnb-epc.jinja2.cfg
+1
-1
software/ors-amarisoft/test/test.jinja2.py
software/ors-amarisoft/test/test.jinja2.py
+0
-17
software/ors-amarisoft/test/testTDD1900.py
software/ors-amarisoft/test/testTDD1900.py
+0
-17
software/ors-amarisoft/test/testTDD2600.py
software/ors-amarisoft/test/testTDD2600.py
+0
-17
software/ors-amarisoft/test/testTDD3500.py
software/ors-amarisoft/test/testTDD3500.py
+0
-17
software/ors-amarisoft/test/testTDD3700.py
software/ors-amarisoft/test/testTDD3700.py
+0
-17
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
558b5655
...
@@ -36,7 +36,7 @@ md5sum = e0b68a87238282568e0e04c792ec7288
...
@@ -36,7 +36,7 @@ md5sum = e0b68a87238282568e0e04c792ec7288
[template-lte-enb-epc]
[template-lte-enb-epc]
_update_hash_filename_ = instance-enb-epc.jinja2.cfg
_update_hash_filename_ = instance-enb-epc.jinja2.cfg
md5sum =
22c2d4f52463de898fcd7516269aed62
md5sum =
107eb2af916569bfa9e7ca56958ad8b4
[template-lte-enb]
[template-lte-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg
_update_hash_filename_ = instance-enb.jinja2.cfg
...
@@ -44,11 +44,11 @@ md5sum = dd85f04ab2836cf459078f0adaf7b847
...
@@ -44,11 +44,11 @@ md5sum = dd85f04ab2836cf459078f0adaf7b847
[template-lte-gnb-epc]
[template-lte-gnb-epc]
_update_hash_filename_ = instance-gnb-epc.jinja2.cfg
_update_hash_filename_ = instance-gnb-epc.jinja2.cfg
md5sum =
12b4a6eb722d0ddd0c6edb2a48285f73
md5sum =
31e73e7f2a3ec6e557e55650594af6ce
[template-lte-epc]
[template-lte-epc]
_update_hash_filename_ = instance-epc.jinja2.cfg
_update_hash_filename_ = instance-epc.jinja2.cfg
md5sum =
397dccca5d9fa027dfc9ba0aab3b7544
md5sum =
0c6fc6e55865357ef6385ff2ca9ae770
[template-lte-gnb]
[template-lte-gnb]
_update_hash_filename_ = instance-gnb.jinja2.cfg
_update_hash_filename_ = instance-gnb.jinja2.cfg
...
...
software/ors-amarisoft/instance-enb-epc.jinja2.cfg
View file @
558b5655
...
@@ -64,7 +64,7 @@ promise = ${:etc}/promise
...
@@ -64,7 +64,7 @@ promise = ${:etc}/promise
log = ${:var}/log
log = ${:var}/log
[request-common-base]
[request-common-base]
recipe = slapos.cookbook:request
optional
.serialised
recipe = slapos.cookbook:request.serialised
software-url = {{ slap_connection['software-release-url'] }}
software-url = {{ slap_connection['software-release-url'] }}
server-url = {{ slap_connection['server-url'] }}
server-url = {{ slap_connection['server-url'] }}
computer-id = {{ slap_connection['computer-id'] }}
computer-id = {{ slap_connection['computer-id'] }}
...
...
software/ors-amarisoft/instance-epc.jinja2.cfg
View file @
558b5655
...
@@ -63,7 +63,7 @@ promise = ${:etc}/promise
...
@@ -63,7 +63,7 @@ promise = ${:etc}/promise
log = ${:var}/log
log = ${:var}/log
[request-common-base]
[request-common-base]
recipe = slapos.cookbook:request
optional
.serialised
recipe = slapos.cookbook:request.serialised
software-url = {{ slap_connection['software-release-url'] }}
software-url = {{ slap_connection['software-release-url'] }}
server-url = {{ slap_connection['server-url'] }}
server-url = {{ slap_connection['server-url'] }}
computer-id = {{ slap_connection['computer-id'] }}
computer-id = {{ slap_connection['computer-id'] }}
...
...
software/ors-amarisoft/instance-gnb-epc.jinja2.cfg
View file @
558b5655
...
@@ -64,7 +64,7 @@ promise = ${:etc}/promise
...
@@ -64,7 +64,7 @@ promise = ${:etc}/promise
log = ${:var}/log
log = ${:var}/log
[request-common-base]
[request-common-base]
recipe = slapos.cookbook:request
optional
.serialised
recipe = slapos.cookbook:request.serialised
software-url = {{ slap_connection['software-release-url'] }}
software-url = {{ slap_connection['software-release-url'] }}
server-url = {{ slap_connection['server-url'] }}
server-url = {{ slap_connection['server-url'] }}
computer-id = {{ slap_connection['computer-id'] }}
computer-id = {{ slap_connection['computer-id'] }}
...
...
software/ors-amarisoft/test/test.jinja2.py
View file @
558b5655
...
@@ -180,7 +180,6 @@ def test_sim_card(self):
...
@@ -180,7 +180,6 @@ def test_sim_card(self):
self
.
assertEqual
(
conf
[
'ue_db'
][
0
][
'K'
],
param_dict
[
'k'
])
self
.
assertEqual
(
conf
[
'ue_db'
][
0
][
'K'
],
param_dict
[
'k'
])
self
.
assertEqual
(
conf
[
'ue_db'
][
0
][
'amf'
],
int
(
param_dict
[
'amf'
],
16
))
self
.
assertEqual
(
conf
[
'ue_db'
][
0
][
'amf'
],
int
(
param_dict
[
'amf'
],
16
))
self
.
slap
.
waitForInstance
()
# Wait until publish is done
p
=
self
.
requestSlaveInstance
().
getConnectionParameterDict
()
p
=
self
.
requestSlaveInstance
().
getConnectionParameterDict
()
p
=
p
[
'_'
]
if
'_'
in
p
else
p
p
=
p
[
'_'
]
if
'_'
in
p
else
p
self
.
assertIn
(
'info'
,
p
)
self
.
assertIn
(
'info'
,
p
)
...
@@ -240,7 +239,6 @@ class TestEPCParameters(ORSTestCase):
...
@@ -240,7 +239,6 @@ class TestEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"epc"
return
"epc"
def
test_mme_conf
(
self
):
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
test_mme_conf
(
self
)
class
TestENBEPCParameters
(
ORSTestCase
):
class
TestENBEPCParameters
(
ORSTestCase
):
...
@@ -251,10 +249,8 @@ class TestENBEPCParameters(ORSTestCase):
...
@@ -251,10 +249,8 @@ class TestENBEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"enb-epc"
return
"enb-epc"
def
test_enb_conf
(
self
):
def
test_enb_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_enb_conf
(
self
)
test_enb_conf
(
self
)
def
test_mme_conf
(
self
):
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
test_mme_conf
(
self
)
class
TestGNBEPCParameters
(
ORSTestCase
):
class
TestGNBEPCParameters
(
ORSTestCase
):
...
@@ -265,10 +261,8 @@ class TestGNBEPCParameters(ORSTestCase):
...
@@ -265,10 +261,8 @@ class TestGNBEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"gnb-epc"
return
"gnb-epc"
def
test_gnb_conf
(
self
):
def
test_gnb_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_gnb_conf1
(
self
)
test_gnb_conf1
(
self
)
def
test_mme_conf
(
self
):
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
test_mme_conf
(
self
)
def
requestSlaveInstance
(
cls
,
software_type
):
def
requestSlaveInstance
(
cls
,
software_type
):
...
@@ -291,7 +285,6 @@ class TestEPCMonitorGadgetUrl(ORSTestCase):
...
@@ -291,7 +285,6 @@ class TestEPCMonitorGadgetUrl(ORSTestCase):
return
"epc"
return
"epc"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestENBMonitorGadgetUrl
(
ORSTestCase
):
class
TestENBMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -304,7 +297,6 @@ class TestENBMonitorGadgetUrl(ORSTestCase):
...
@@ -304,7 +297,6 @@ class TestENBMonitorGadgetUrl(ORSTestCase):
return
"enb"
return
"enb"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestENBEPCMonitorGadgetUrl
(
ORSTestCase
):
class
TestENBEPCMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -317,7 +309,6 @@ class TestENBEPCMonitorGadgetUrl(ORSTestCase):
...
@@ -317,7 +309,6 @@ class TestENBEPCMonitorGadgetUrl(ORSTestCase):
return
"enb-epc"
return
"enb-epc"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestGNBEPCMonitorGadgetUrl
(
ORSTestCase
):
class
TestGNBEPCMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -330,7 +321,6 @@ class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
...
@@ -330,7 +321,6 @@ class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
return
"gnb-epc"
return
"gnb-epc"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestGNBMonitorGadgetUrl
(
ORSTestCase
):
class
TestGNBMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -343,7 +333,6 @@ class TestGNBMonitorGadgetUrl(ORSTestCase):
...
@@ -343,7 +333,6 @@ class TestGNBMonitorGadgetUrl(ORSTestCase):
return
"gnb"
return
"gnb"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestMMEMonitorGadgetUrl
(
ORSTestCase
):
class
TestMMEMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -356,7 +345,6 @@ class TestMMEMonitorGadgetUrl(ORSTestCase):
...
@@ -356,7 +345,6 @@ class TestMMEMonitorGadgetUrl(ORSTestCase):
return
"mme"
return
"mme"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestUELTEMonitorGadgetUrl
(
ORSTestCase
):
class
TestUELTEMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -369,7 +357,6 @@ class TestUELTEMonitorGadgetUrl(ORSTestCase):
...
@@ -369,7 +357,6 @@ class TestUELTEMonitorGadgetUrl(ORSTestCase):
return
"ue-lte"
return
"ue-lte"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestUENRMonitorGadgetUrl
(
ORSTestCase
):
class
TestUENRMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -382,7 +369,6 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
...
@@ -382,7 +369,6 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
return
"ue-nr"
return
"ue-nr"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestEPCSimCard
(
ORSTestCase
):
class
TestEPCSimCard
(
ORSTestCase
):
...
@@ -402,7 +388,6 @@ class TestEPCSimCard(ORSTestCase):
...
@@ -402,7 +388,6 @@ class TestEPCSimCard(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"epc"
return
"epc"
def
test_sim_card
(
self
):
def
test_sim_card
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_sim_card
(
self
)
test_sim_card
(
self
)
class
TestENBEPCSimCard
(
ORSTestCase
):
class
TestENBEPCSimCard
(
ORSTestCase
):
...
@@ -422,7 +407,6 @@ class TestENBEPCSimCard(ORSTestCase):
...
@@ -422,7 +407,6 @@ class TestENBEPCSimCard(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"enb-epc"
return
"enb-epc"
def
test_sim_card
(
self
):
def
test_sim_card
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_sim_card
(
self
)
test_sim_card
(
self
)
class
TestGNBEPCSimCard
(
ORSTestCase
):
class
TestGNBEPCSimCard
(
ORSTestCase
):
...
@@ -442,7 +426,6 @@ class TestGNBEPCSimCard(ORSTestCase):
...
@@ -442,7 +426,6 @@ class TestGNBEPCSimCard(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"gnb-epc"
return
"gnb-epc"
def
test_sim_card
(
self
):
def
test_sim_card
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_sim_card
(
self
)
test_sim_card
(
self
)
class
TestUELTEParameters
(
ORSTestCase
):
class
TestUELTEParameters
(
ORSTestCase
):
...
...
software/ors-amarisoft/test/testTDD1900.py
View file @
558b5655
...
@@ -180,7 +180,6 @@ def test_sim_card(self):
...
@@ -180,7 +180,6 @@ def test_sim_card(self):
self
.
assertEqual
(
conf
[
'ue_db'
][
0
][
'K'
],
param_dict
[
'k'
])
self
.
assertEqual
(
conf
[
'ue_db'
][
0
][
'K'
],
param_dict
[
'k'
])
self
.
assertEqual
(
conf
[
'ue_db'
][
0
][
'amf'
],
int
(
param_dict
[
'amf'
],
16
))
self
.
assertEqual
(
conf
[
'ue_db'
][
0
][
'amf'
],
int
(
param_dict
[
'amf'
],
16
))
self
.
slap
.
waitForInstance
()
# Wait until publish is done
p
=
self
.
requestSlaveInstance
().
getConnectionParameterDict
()
p
=
self
.
requestSlaveInstance
().
getConnectionParameterDict
()
p
=
p
[
'_'
]
if
'_'
in
p
else
p
p
=
p
[
'_'
]
if
'_'
in
p
else
p
self
.
assertIn
(
'info'
,
p
)
self
.
assertIn
(
'info'
,
p
)
...
@@ -240,7 +239,6 @@ class TestEPCParameters(ORSTestCase):
...
@@ -240,7 +239,6 @@ class TestEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"epc"
return
"epc"
def
test_mme_conf
(
self
):
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
test_mme_conf
(
self
)
class
TestENBEPCParameters
(
ORSTestCase
):
class
TestENBEPCParameters
(
ORSTestCase
):
...
@@ -251,10 +249,8 @@ class TestENBEPCParameters(ORSTestCase):
...
@@ -251,10 +249,8 @@ class TestENBEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"enb-epc"
return
"enb-epc"
def
test_enb_conf
(
self
):
def
test_enb_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_enb_conf
(
self
)
test_enb_conf
(
self
)
def
test_mme_conf
(
self
):
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
test_mme_conf
(
self
)
class
TestGNBEPCParameters
(
ORSTestCase
):
class
TestGNBEPCParameters
(
ORSTestCase
):
...
@@ -265,10 +261,8 @@ class TestGNBEPCParameters(ORSTestCase):
...
@@ -265,10 +261,8 @@ class TestGNBEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"gnb-epc"
return
"gnb-epc"
def
test_gnb_conf
(
self
):
def
test_gnb_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_gnb_conf1
(
self
)
test_gnb_conf1
(
self
)
def
test_mme_conf
(
self
):
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
test_mme_conf
(
self
)
def
requestSlaveInstance
(
cls
,
software_type
):
def
requestSlaveInstance
(
cls
,
software_type
):
...
@@ -291,7 +285,6 @@ class TestEPCMonitorGadgetUrl(ORSTestCase):
...
@@ -291,7 +285,6 @@ class TestEPCMonitorGadgetUrl(ORSTestCase):
return
"epc"
return
"epc"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestENBMonitorGadgetUrl
(
ORSTestCase
):
class
TestENBMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -304,7 +297,6 @@ class TestENBMonitorGadgetUrl(ORSTestCase):
...
@@ -304,7 +297,6 @@ class TestENBMonitorGadgetUrl(ORSTestCase):
return
"enb"
return
"enb"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestENBEPCMonitorGadgetUrl
(
ORSTestCase
):
class
TestENBEPCMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -317,7 +309,6 @@ class TestENBEPCMonitorGadgetUrl(ORSTestCase):
...
@@ -317,7 +309,6 @@ class TestENBEPCMonitorGadgetUrl(ORSTestCase):
return
"enb-epc"
return
"enb-epc"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestGNBEPCMonitorGadgetUrl
(
ORSTestCase
):
class
TestGNBEPCMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -330,7 +321,6 @@ class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
...
@@ -330,7 +321,6 @@ class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
return
"gnb-epc"
return
"gnb-epc"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestGNBMonitorGadgetUrl
(
ORSTestCase
):
class
TestGNBMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -343,7 +333,6 @@ class TestGNBMonitorGadgetUrl(ORSTestCase):
...
@@ -343,7 +333,6 @@ class TestGNBMonitorGadgetUrl(ORSTestCase):
return
"gnb"
return
"gnb"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestMMEMonitorGadgetUrl
(
ORSTestCase
):
class
TestMMEMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -356,7 +345,6 @@ class TestMMEMonitorGadgetUrl(ORSTestCase):
...
@@ -356,7 +345,6 @@ class TestMMEMonitorGadgetUrl(ORSTestCase):
return
"mme"
return
"mme"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestUELTEMonitorGadgetUrl
(
ORSTestCase
):
class
TestUELTEMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -369,7 +357,6 @@ class TestUELTEMonitorGadgetUrl(ORSTestCase):
...
@@ -369,7 +357,6 @@ class TestUELTEMonitorGadgetUrl(ORSTestCase):
return
"ue-lte"
return
"ue-lte"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestUENRMonitorGadgetUrl
(
ORSTestCase
):
class
TestUENRMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -382,7 +369,6 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
...
@@ -382,7 +369,6 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
return
"ue-nr"
return
"ue-nr"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestEPCSimCard
(
ORSTestCase
):
class
TestEPCSimCard
(
ORSTestCase
):
...
@@ -402,7 +388,6 @@ class TestEPCSimCard(ORSTestCase):
...
@@ -402,7 +388,6 @@ class TestEPCSimCard(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"epc"
return
"epc"
def
test_sim_card
(
self
):
def
test_sim_card
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_sim_card
(
self
)
test_sim_card
(
self
)
class
TestENBEPCSimCard
(
ORSTestCase
):
class
TestENBEPCSimCard
(
ORSTestCase
):
...
@@ -422,7 +407,6 @@ class TestENBEPCSimCard(ORSTestCase):
...
@@ -422,7 +407,6 @@ class TestENBEPCSimCard(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"enb-epc"
return
"enb-epc"
def
test_sim_card
(
self
):
def
test_sim_card
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_sim_card
(
self
)
test_sim_card
(
self
)
class
TestGNBEPCSimCard
(
ORSTestCase
):
class
TestGNBEPCSimCard
(
ORSTestCase
):
...
@@ -442,7 +426,6 @@ class TestGNBEPCSimCard(ORSTestCase):
...
@@ -442,7 +426,6 @@ class TestGNBEPCSimCard(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"gnb-epc"
return
"gnb-epc"
def
test_sim_card
(
self
):
def
test_sim_card
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_sim_card
(
self
)
test_sim_card
(
self
)
class
TestUELTEParameters
(
ORSTestCase
):
class
TestUELTEParameters
(
ORSTestCase
):
...
...
software/ors-amarisoft/test/testTDD2600.py
View file @
558b5655
...
@@ -180,7 +180,6 @@ def test_sim_card(self):
...
@@ -180,7 +180,6 @@ def test_sim_card(self):
self
.
assertEqual
(
conf
[
'ue_db'
][
0
][
'K'
],
param_dict
[
'k'
])
self
.
assertEqual
(
conf
[
'ue_db'
][
0
][
'K'
],
param_dict
[
'k'
])
self
.
assertEqual
(
conf
[
'ue_db'
][
0
][
'amf'
],
int
(
param_dict
[
'amf'
],
16
))
self
.
assertEqual
(
conf
[
'ue_db'
][
0
][
'amf'
],
int
(
param_dict
[
'amf'
],
16
))
self
.
slap
.
waitForInstance
()
# Wait until publish is done
p
=
self
.
requestSlaveInstance
().
getConnectionParameterDict
()
p
=
self
.
requestSlaveInstance
().
getConnectionParameterDict
()
p
=
p
[
'_'
]
if
'_'
in
p
else
p
p
=
p
[
'_'
]
if
'_'
in
p
else
p
self
.
assertIn
(
'info'
,
p
)
self
.
assertIn
(
'info'
,
p
)
...
@@ -240,7 +239,6 @@ class TestEPCParameters(ORSTestCase):
...
@@ -240,7 +239,6 @@ class TestEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"epc"
return
"epc"
def
test_mme_conf
(
self
):
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
test_mme_conf
(
self
)
class
TestENBEPCParameters
(
ORSTestCase
):
class
TestENBEPCParameters
(
ORSTestCase
):
...
@@ -251,10 +249,8 @@ class TestENBEPCParameters(ORSTestCase):
...
@@ -251,10 +249,8 @@ class TestENBEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"enb-epc"
return
"enb-epc"
def
test_enb_conf
(
self
):
def
test_enb_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_enb_conf
(
self
)
test_enb_conf
(
self
)
def
test_mme_conf
(
self
):
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
test_mme_conf
(
self
)
class
TestGNBEPCParameters
(
ORSTestCase
):
class
TestGNBEPCParameters
(
ORSTestCase
):
...
@@ -265,10 +261,8 @@ class TestGNBEPCParameters(ORSTestCase):
...
@@ -265,10 +261,8 @@ class TestGNBEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"gnb-epc"
return
"gnb-epc"
def
test_gnb_conf
(
self
):
def
test_gnb_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_gnb_conf1
(
self
)
test_gnb_conf1
(
self
)
def
test_mme_conf
(
self
):
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
test_mme_conf
(
self
)
def
requestSlaveInstance
(
cls
,
software_type
):
def
requestSlaveInstance
(
cls
,
software_type
):
...
@@ -291,7 +285,6 @@ class TestEPCMonitorGadgetUrl(ORSTestCase):
...
@@ -291,7 +285,6 @@ class TestEPCMonitorGadgetUrl(ORSTestCase):
return
"epc"
return
"epc"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestENBMonitorGadgetUrl
(
ORSTestCase
):
class
TestENBMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -304,7 +297,6 @@ class TestENBMonitorGadgetUrl(ORSTestCase):
...
@@ -304,7 +297,6 @@ class TestENBMonitorGadgetUrl(ORSTestCase):
return
"enb"
return
"enb"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestENBEPCMonitorGadgetUrl
(
ORSTestCase
):
class
TestENBEPCMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -317,7 +309,6 @@ class TestENBEPCMonitorGadgetUrl(ORSTestCase):
...
@@ -317,7 +309,6 @@ class TestENBEPCMonitorGadgetUrl(ORSTestCase):
return
"enb-epc"
return
"enb-epc"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestGNBEPCMonitorGadgetUrl
(
ORSTestCase
):
class
TestGNBEPCMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -330,7 +321,6 @@ class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
...
@@ -330,7 +321,6 @@ class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
return
"gnb-epc"
return
"gnb-epc"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestGNBMonitorGadgetUrl
(
ORSTestCase
):
class
TestGNBMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -343,7 +333,6 @@ class TestGNBMonitorGadgetUrl(ORSTestCase):
...
@@ -343,7 +333,6 @@ class TestGNBMonitorGadgetUrl(ORSTestCase):
return
"gnb"
return
"gnb"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestMMEMonitorGadgetUrl
(
ORSTestCase
):
class
TestMMEMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -356,7 +345,6 @@ class TestMMEMonitorGadgetUrl(ORSTestCase):
...
@@ -356,7 +345,6 @@ class TestMMEMonitorGadgetUrl(ORSTestCase):
return
"mme"
return
"mme"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestUELTEMonitorGadgetUrl
(
ORSTestCase
):
class
TestUELTEMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -369,7 +357,6 @@ class TestUELTEMonitorGadgetUrl(ORSTestCase):
...
@@ -369,7 +357,6 @@ class TestUELTEMonitorGadgetUrl(ORSTestCase):
return
"ue-lte"
return
"ue-lte"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestUENRMonitorGadgetUrl
(
ORSTestCase
):
class
TestUENRMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -382,7 +369,6 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
...
@@ -382,7 +369,6 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
return
"ue-nr"
return
"ue-nr"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestEPCSimCard
(
ORSTestCase
):
class
TestEPCSimCard
(
ORSTestCase
):
...
@@ -402,7 +388,6 @@ class TestEPCSimCard(ORSTestCase):
...
@@ -402,7 +388,6 @@ class TestEPCSimCard(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"epc"
return
"epc"
def
test_sim_card
(
self
):
def
test_sim_card
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_sim_card
(
self
)
test_sim_card
(
self
)
class
TestENBEPCSimCard
(
ORSTestCase
):
class
TestENBEPCSimCard
(
ORSTestCase
):
...
@@ -422,7 +407,6 @@ class TestENBEPCSimCard(ORSTestCase):
...
@@ -422,7 +407,6 @@ class TestENBEPCSimCard(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"enb-epc"
return
"enb-epc"
def
test_sim_card
(
self
):
def
test_sim_card
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_sim_card
(
self
)
test_sim_card
(
self
)
class
TestGNBEPCSimCard
(
ORSTestCase
):
class
TestGNBEPCSimCard
(
ORSTestCase
):
...
@@ -442,7 +426,6 @@ class TestGNBEPCSimCard(ORSTestCase):
...
@@ -442,7 +426,6 @@ class TestGNBEPCSimCard(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"gnb-epc"
return
"gnb-epc"
def
test_sim_card
(
self
):
def
test_sim_card
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_sim_card
(
self
)
test_sim_card
(
self
)
class
TestUELTEParameters
(
ORSTestCase
):
class
TestUELTEParameters
(
ORSTestCase
):
...
...
software/ors-amarisoft/test/testTDD3500.py
View file @
558b5655
...
@@ -180,7 +180,6 @@ def test_sim_card(self):
...
@@ -180,7 +180,6 @@ def test_sim_card(self):
self
.
assertEqual
(
conf
[
'ue_db'
][
0
][
'K'
],
param_dict
[
'k'
])
self
.
assertEqual
(
conf
[
'ue_db'
][
0
][
'K'
],
param_dict
[
'k'
])
self
.
assertEqual
(
conf
[
'ue_db'
][
0
][
'amf'
],
int
(
param_dict
[
'amf'
],
16
))
self
.
assertEqual
(
conf
[
'ue_db'
][
0
][
'amf'
],
int
(
param_dict
[
'amf'
],
16
))
self
.
slap
.
waitForInstance
()
# Wait until publish is done
p
=
self
.
requestSlaveInstance
().
getConnectionParameterDict
()
p
=
self
.
requestSlaveInstance
().
getConnectionParameterDict
()
p
=
p
[
'_'
]
if
'_'
in
p
else
p
p
=
p
[
'_'
]
if
'_'
in
p
else
p
self
.
assertIn
(
'info'
,
p
)
self
.
assertIn
(
'info'
,
p
)
...
@@ -240,7 +239,6 @@ class TestEPCParameters(ORSTestCase):
...
@@ -240,7 +239,6 @@ class TestEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"epc"
return
"epc"
def
test_mme_conf
(
self
):
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
test_mme_conf
(
self
)
class
TestENBEPCParameters
(
ORSTestCase
):
class
TestENBEPCParameters
(
ORSTestCase
):
...
@@ -251,10 +249,8 @@ class TestENBEPCParameters(ORSTestCase):
...
@@ -251,10 +249,8 @@ class TestENBEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"enb-epc"
return
"enb-epc"
def
test_enb_conf
(
self
):
def
test_enb_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_enb_conf
(
self
)
test_enb_conf
(
self
)
def
test_mme_conf
(
self
):
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
test_mme_conf
(
self
)
class
TestGNBEPCParameters
(
ORSTestCase
):
class
TestGNBEPCParameters
(
ORSTestCase
):
...
@@ -265,10 +261,8 @@ class TestGNBEPCParameters(ORSTestCase):
...
@@ -265,10 +261,8 @@ class TestGNBEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"gnb-epc"
return
"gnb-epc"
def
test_gnb_conf
(
self
):
def
test_gnb_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_gnb_conf1
(
self
)
test_gnb_conf1
(
self
)
def
test_mme_conf
(
self
):
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
test_mme_conf
(
self
)
def
requestSlaveInstance
(
cls
,
software_type
):
def
requestSlaveInstance
(
cls
,
software_type
):
...
@@ -291,7 +285,6 @@ class TestEPCMonitorGadgetUrl(ORSTestCase):
...
@@ -291,7 +285,6 @@ class TestEPCMonitorGadgetUrl(ORSTestCase):
return
"epc"
return
"epc"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestENBMonitorGadgetUrl
(
ORSTestCase
):
class
TestENBMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -304,7 +297,6 @@ class TestENBMonitorGadgetUrl(ORSTestCase):
...
@@ -304,7 +297,6 @@ class TestENBMonitorGadgetUrl(ORSTestCase):
return
"enb"
return
"enb"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestENBEPCMonitorGadgetUrl
(
ORSTestCase
):
class
TestENBEPCMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -317,7 +309,6 @@ class TestENBEPCMonitorGadgetUrl(ORSTestCase):
...
@@ -317,7 +309,6 @@ class TestENBEPCMonitorGadgetUrl(ORSTestCase):
return
"enb-epc"
return
"enb-epc"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestGNBEPCMonitorGadgetUrl
(
ORSTestCase
):
class
TestGNBEPCMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -330,7 +321,6 @@ class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
...
@@ -330,7 +321,6 @@ class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
return
"gnb-epc"
return
"gnb-epc"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestGNBMonitorGadgetUrl
(
ORSTestCase
):
class
TestGNBMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -343,7 +333,6 @@ class TestGNBMonitorGadgetUrl(ORSTestCase):
...
@@ -343,7 +333,6 @@ class TestGNBMonitorGadgetUrl(ORSTestCase):
return
"gnb"
return
"gnb"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestMMEMonitorGadgetUrl
(
ORSTestCase
):
class
TestMMEMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -356,7 +345,6 @@ class TestMMEMonitorGadgetUrl(ORSTestCase):
...
@@ -356,7 +345,6 @@ class TestMMEMonitorGadgetUrl(ORSTestCase):
return
"mme"
return
"mme"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestUELTEMonitorGadgetUrl
(
ORSTestCase
):
class
TestUELTEMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -369,7 +357,6 @@ class TestUELTEMonitorGadgetUrl(ORSTestCase):
...
@@ -369,7 +357,6 @@ class TestUELTEMonitorGadgetUrl(ORSTestCase):
return
"ue-lte"
return
"ue-lte"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestUENRMonitorGadgetUrl
(
ORSTestCase
):
class
TestUENRMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -382,7 +369,6 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
...
@@ -382,7 +369,6 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
return
"ue-nr"
return
"ue-nr"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestEPCSimCard
(
ORSTestCase
):
class
TestEPCSimCard
(
ORSTestCase
):
...
@@ -402,7 +388,6 @@ class TestEPCSimCard(ORSTestCase):
...
@@ -402,7 +388,6 @@ class TestEPCSimCard(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"epc"
return
"epc"
def
test_sim_card
(
self
):
def
test_sim_card
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_sim_card
(
self
)
test_sim_card
(
self
)
class
TestENBEPCSimCard
(
ORSTestCase
):
class
TestENBEPCSimCard
(
ORSTestCase
):
...
@@ -422,7 +407,6 @@ class TestENBEPCSimCard(ORSTestCase):
...
@@ -422,7 +407,6 @@ class TestENBEPCSimCard(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"enb-epc"
return
"enb-epc"
def
test_sim_card
(
self
):
def
test_sim_card
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_sim_card
(
self
)
test_sim_card
(
self
)
class
TestGNBEPCSimCard
(
ORSTestCase
):
class
TestGNBEPCSimCard
(
ORSTestCase
):
...
@@ -442,7 +426,6 @@ class TestGNBEPCSimCard(ORSTestCase):
...
@@ -442,7 +426,6 @@ class TestGNBEPCSimCard(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"gnb-epc"
return
"gnb-epc"
def
test_sim_card
(
self
):
def
test_sim_card
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_sim_card
(
self
)
test_sim_card
(
self
)
class
TestUELTEParameters
(
ORSTestCase
):
class
TestUELTEParameters
(
ORSTestCase
):
...
...
software/ors-amarisoft/test/testTDD3700.py
View file @
558b5655
...
@@ -180,7 +180,6 @@ def test_sim_card(self):
...
@@ -180,7 +180,6 @@ def test_sim_card(self):
self
.
assertEqual
(
conf
[
'ue_db'
][
0
][
'K'
],
param_dict
[
'k'
])
self
.
assertEqual
(
conf
[
'ue_db'
][
0
][
'K'
],
param_dict
[
'k'
])
self
.
assertEqual
(
conf
[
'ue_db'
][
0
][
'amf'
],
int
(
param_dict
[
'amf'
],
16
))
self
.
assertEqual
(
conf
[
'ue_db'
][
0
][
'amf'
],
int
(
param_dict
[
'amf'
],
16
))
self
.
slap
.
waitForInstance
()
# Wait until publish is done
p
=
self
.
requestSlaveInstance
().
getConnectionParameterDict
()
p
=
self
.
requestSlaveInstance
().
getConnectionParameterDict
()
p
=
p
[
'_'
]
if
'_'
in
p
else
p
p
=
p
[
'_'
]
if
'_'
in
p
else
p
self
.
assertIn
(
'info'
,
p
)
self
.
assertIn
(
'info'
,
p
)
...
@@ -240,7 +239,6 @@ class TestEPCParameters(ORSTestCase):
...
@@ -240,7 +239,6 @@ class TestEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"epc"
return
"epc"
def
test_mme_conf
(
self
):
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
test_mme_conf
(
self
)
class
TestENBEPCParameters
(
ORSTestCase
):
class
TestENBEPCParameters
(
ORSTestCase
):
...
@@ -251,10 +249,8 @@ class TestENBEPCParameters(ORSTestCase):
...
@@ -251,10 +249,8 @@ class TestENBEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"enb-epc"
return
"enb-epc"
def
test_enb_conf
(
self
):
def
test_enb_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_enb_conf
(
self
)
test_enb_conf
(
self
)
def
test_mme_conf
(
self
):
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
test_mme_conf
(
self
)
class
TestGNBEPCParameters
(
ORSTestCase
):
class
TestGNBEPCParameters
(
ORSTestCase
):
...
@@ -265,10 +261,8 @@ class TestGNBEPCParameters(ORSTestCase):
...
@@ -265,10 +261,8 @@ class TestGNBEPCParameters(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"gnb-epc"
return
"gnb-epc"
def
test_gnb_conf
(
self
):
def
test_gnb_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_gnb_conf1
(
self
)
test_gnb_conf1
(
self
)
def
test_mme_conf
(
self
):
def
test_mme_conf
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_mme_conf
(
self
)
test_mme_conf
(
self
)
def
requestSlaveInstance
(
cls
,
software_type
):
def
requestSlaveInstance
(
cls
,
software_type
):
...
@@ -291,7 +285,6 @@ class TestEPCMonitorGadgetUrl(ORSTestCase):
...
@@ -291,7 +285,6 @@ class TestEPCMonitorGadgetUrl(ORSTestCase):
return
"epc"
return
"epc"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestENBMonitorGadgetUrl
(
ORSTestCase
):
class
TestENBMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -304,7 +297,6 @@ class TestENBMonitorGadgetUrl(ORSTestCase):
...
@@ -304,7 +297,6 @@ class TestENBMonitorGadgetUrl(ORSTestCase):
return
"enb"
return
"enb"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestENBEPCMonitorGadgetUrl
(
ORSTestCase
):
class
TestENBEPCMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -317,7 +309,6 @@ class TestENBEPCMonitorGadgetUrl(ORSTestCase):
...
@@ -317,7 +309,6 @@ class TestENBEPCMonitorGadgetUrl(ORSTestCase):
return
"enb-epc"
return
"enb-epc"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestGNBEPCMonitorGadgetUrl
(
ORSTestCase
):
class
TestGNBEPCMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -330,7 +321,6 @@ class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
...
@@ -330,7 +321,6 @@ class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
return
"gnb-epc"
return
"gnb-epc"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestGNBMonitorGadgetUrl
(
ORSTestCase
):
class
TestGNBMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -343,7 +333,6 @@ class TestGNBMonitorGadgetUrl(ORSTestCase):
...
@@ -343,7 +333,6 @@ class TestGNBMonitorGadgetUrl(ORSTestCase):
return
"gnb"
return
"gnb"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestMMEMonitorGadgetUrl
(
ORSTestCase
):
class
TestMMEMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -356,7 +345,6 @@ class TestMMEMonitorGadgetUrl(ORSTestCase):
...
@@ -356,7 +345,6 @@ class TestMMEMonitorGadgetUrl(ORSTestCase):
return
"mme"
return
"mme"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestUELTEMonitorGadgetUrl
(
ORSTestCase
):
class
TestUELTEMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -369,7 +357,6 @@ class TestUELTEMonitorGadgetUrl(ORSTestCase):
...
@@ -369,7 +357,6 @@ class TestUELTEMonitorGadgetUrl(ORSTestCase):
return
"ue-lte"
return
"ue-lte"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestUENRMonitorGadgetUrl
(
ORSTestCase
):
class
TestUENRMonitorGadgetUrl
(
ORSTestCase
):
...
@@ -382,7 +369,6 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
...
@@ -382,7 +369,6 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
return
"ue-nr"
return
"ue-nr"
def
test_monitor_gadget_url
(
self
):
def
test_monitor_gadget_url
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_monitor_gadget_url
(
self
)
test_monitor_gadget_url
(
self
)
class
TestEPCSimCard
(
ORSTestCase
):
class
TestEPCSimCard
(
ORSTestCase
):
...
@@ -402,7 +388,6 @@ class TestEPCSimCard(ORSTestCase):
...
@@ -402,7 +388,6 @@ class TestEPCSimCard(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"epc"
return
"epc"
def
test_sim_card
(
self
):
def
test_sim_card
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_sim_card
(
self
)
test_sim_card
(
self
)
class
TestENBEPCSimCard
(
ORSTestCase
):
class
TestENBEPCSimCard
(
ORSTestCase
):
...
@@ -422,7 +407,6 @@ class TestENBEPCSimCard(ORSTestCase):
...
@@ -422,7 +407,6 @@ class TestENBEPCSimCard(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"enb-epc"
return
"enb-epc"
def
test_sim_card
(
self
):
def
test_sim_card
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_sim_card
(
self
)
test_sim_card
(
self
)
class
TestGNBEPCSimCard
(
ORSTestCase
):
class
TestGNBEPCSimCard
(
ORSTestCase
):
...
@@ -442,7 +426,6 @@ class TestGNBEPCSimCard(ORSTestCase):
...
@@ -442,7 +426,6 @@ class TestGNBEPCSimCard(ORSTestCase):
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
"gnb-epc"
return
"gnb-epc"
def
test_sim_card
(
self
):
def
test_sim_card
(
self
):
self
.
slap
.
waitForInstance
()
# Wait until publish is done
test_sim_card
(
self
)
test_sim_card
(
self
)
class
TestUELTEParameters
(
ORSTestCase
):
class
TestUELTEParameters
(
ORSTestCase
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment