Commit b9ba23b4 authored by Lu Xu's avatar Lu Xu 👀

fixup

parent 8cc692f8
...@@ -44,11 +44,11 @@ md5sum = 728f4d3ae248710c23e4b73eea4d628e ...@@ -44,11 +44,11 @@ md5sum = 728f4d3ae248710c23e4b73eea4d628e
[template-lte-ue-lte] [template-lte-ue-lte]
_update_hash_filename_ = instance-ue-lte.jinja2.cfg _update_hash_filename_ = instance-ue-lte.jinja2.cfg
md5sum = db6bd2f8100df126296f37ecf1845454 md5sum = ca9db7dd38cea0bab12c4f8f4f7028d0
[template-lte-ue-nr] [template-lte-ue-nr]
_update_hash_filename_ = instance-ue-nr.jinja2.cfg _update_hash_filename_ = instance-ue-nr.jinja2.cfg
md5sum = dedfd6ee94bcfb5468040071576ebc17 md5sum = 15257aa42c7f9eb4eb8058591e6dfec4
[ue_db.jinja2.cfg] [ue_db.jinja2.cfg]
filename = config/ue_db.jinja2.cfg filename = config/ue_db.jinja2.cfg
......
...@@ -101,7 +101,7 @@ url = ${ue-lte-config-dl:target} ...@@ -101,7 +101,7 @@ url = ${ue-lte-config-dl:target}
{% else %} {% else %}
url = {{ ue_lte_template }} url = {{ ue_lte_template }}
{% endif %} {% endif %}
output = ${directory:etc}/ue-lte.cfg output = ${directory:etc}/ue.cfg
[publish-connection-information] [publish-connection-information]
<= monitor-publish <= monitor-publish
......
...@@ -103,7 +103,7 @@ url = ${ue-nr-config-dl:target} ...@@ -103,7 +103,7 @@ url = ${ue-nr-config-dl:target}
{% else %} {% else %}
url = {{ ue_nr_template }} url = {{ ue_nr_template }}
{% endif %} {% endif %}
output = ${directory:etc}/ue-nr.cfg output = ${directory:etc}/ue.cfg
[publish-connection-information] [publish-connection-information]
<= monitor-publish <= monitor-publish
......
...@@ -333,7 +333,7 @@ class TestUELTEParameters(ORSTestCase): ...@@ -333,7 +333,7 @@ class TestUELTEParameters(ORSTestCase):
return "ue-lte" return "ue-lte"
def test_ue_lte_conf(self): def test_ue_lte_conf(self):
conf_file = glob.glob(os.path.join( conf_file = glob.glob(os.path.join(
self.slap.instance_directory, '*', 'etc', 'ue-lte.cfg'))[0] self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
with open(conf_file, 'r') as f: with open(conf_file, 'r') as f:
conf = yaml.load(f) conf = yaml.load(f)
...@@ -353,7 +353,7 @@ class TestUENRParameters(ORSTestCase): ...@@ -353,7 +353,7 @@ class TestUENRParameters(ORSTestCase):
return "ue-nr" return "ue-nr"
def test_ue_nr_conf(self): def test_ue_nr_conf(self):
conf_file = glob.glob(os.path.join( conf_file = glob.glob(os.path.join(
self.slap.instance_directory, '*', 'etc', 'ue-nr.cfg'))[0] self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
with open(conf_file, 'r') as f: with open(conf_file, 'r') as f:
conf = yaml.load(f) conf = yaml.load(f)
......
...@@ -333,7 +333,7 @@ class TestUELTEParameters(ORSTestCase): ...@@ -333,7 +333,7 @@ class TestUELTEParameters(ORSTestCase):
return "ue-lte" return "ue-lte"
def test_ue_lte_conf(self): def test_ue_lte_conf(self):
conf_file = glob.glob(os.path.join( conf_file = glob.glob(os.path.join(
self.slap.instance_directory, '*', 'etc', 'ue-lte.cfg'))[0] self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
with open(conf_file, 'r') as f: with open(conf_file, 'r') as f:
conf = yaml.load(f) conf = yaml.load(f)
...@@ -353,7 +353,7 @@ class TestUENRParameters(ORSTestCase): ...@@ -353,7 +353,7 @@ class TestUENRParameters(ORSTestCase):
return "ue-nr" return "ue-nr"
def test_ue_nr_conf(self): def test_ue_nr_conf(self):
conf_file = glob.glob(os.path.join( conf_file = glob.glob(os.path.join(
self.slap.instance_directory, '*', 'etc', 'ue-nr.cfg'))[0] self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
with open(conf_file, 'r') as f: with open(conf_file, 'r') as f:
conf = yaml.load(f) conf = yaml.load(f)
......
...@@ -333,7 +333,7 @@ class TestUELTEParameters(ORSTestCase): ...@@ -333,7 +333,7 @@ class TestUELTEParameters(ORSTestCase):
return "ue-lte" return "ue-lte"
def test_ue_lte_conf(self): def test_ue_lte_conf(self):
conf_file = glob.glob(os.path.join( conf_file = glob.glob(os.path.join(
self.slap.instance_directory, '*', 'etc', 'ue-lte.cfg'))[0] self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
with open(conf_file, 'r') as f: with open(conf_file, 'r') as f:
conf = yaml.load(f) conf = yaml.load(f)
...@@ -353,7 +353,7 @@ class TestUENRParameters(ORSTestCase): ...@@ -353,7 +353,7 @@ class TestUENRParameters(ORSTestCase):
return "ue-nr" return "ue-nr"
def test_ue_nr_conf(self): def test_ue_nr_conf(self):
conf_file = glob.glob(os.path.join( conf_file = glob.glob(os.path.join(
self.slap.instance_directory, '*', 'etc', 'ue-nr.cfg'))[0] self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
with open(conf_file, 'r') as f: with open(conf_file, 'r') as f:
conf = yaml.load(f) conf = yaml.load(f)
......
...@@ -333,7 +333,7 @@ class TestUELTEParameters(ORSTestCase): ...@@ -333,7 +333,7 @@ class TestUELTEParameters(ORSTestCase):
return "ue-lte" return "ue-lte"
def test_ue_lte_conf(self): def test_ue_lte_conf(self):
conf_file = glob.glob(os.path.join( conf_file = glob.glob(os.path.join(
self.slap.instance_directory, '*', 'etc', 'ue-lte.cfg'))[0] self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
with open(conf_file, 'r') as f: with open(conf_file, 'r') as f:
conf = yaml.load(f) conf = yaml.load(f)
...@@ -353,7 +353,7 @@ class TestUENRParameters(ORSTestCase): ...@@ -353,7 +353,7 @@ class TestUENRParameters(ORSTestCase):
return "ue-nr" return "ue-nr"
def test_ue_nr_conf(self): def test_ue_nr_conf(self):
conf_file = glob.glob(os.path.join( conf_file = glob.glob(os.path.join(
self.slap.instance_directory, '*', 'etc', 'ue-nr.cfg'))[0] self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
with open(conf_file, 'r') as f: with open(conf_file, 'r') as f:
conf = yaml.load(f) conf = yaml.load(f)
......
...@@ -333,7 +333,7 @@ class TestUELTEParameters(ORSTestCase): ...@@ -333,7 +333,7 @@ class TestUELTEParameters(ORSTestCase):
return "ue-lte" return "ue-lte"
def test_ue_lte_conf(self): def test_ue_lte_conf(self):
conf_file = glob.glob(os.path.join( conf_file = glob.glob(os.path.join(
self.slap.instance_directory, '*', 'etc', 'ue-lte.cfg'))[0] self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
with open(conf_file, 'r') as f: with open(conf_file, 'r') as f:
conf = yaml.load(f) conf = yaml.load(f)
...@@ -353,7 +353,7 @@ class TestUENRParameters(ORSTestCase): ...@@ -353,7 +353,7 @@ class TestUENRParameters(ORSTestCase):
return "ue-nr" return "ue-nr"
def test_ue_nr_conf(self): def test_ue_nr_conf(self):
conf_file = glob.glob(os.path.join( conf_file = glob.glob(os.path.join(
self.slap.instance_directory, '*', 'etc', 'ue-nr.cfg'))[0] self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
with open(conf_file, 'r') as f: with open(conf_file, 'r') as f:
conf = yaml.load(f) conf = yaml.load(f)
......
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