diff --git a/ci-scripts/epc.py b/ci-scripts/epc.py index 867236f97e..64074fdd6a 100644 --- a/ci-scripts/epc.py +++ b/ci-scripts/epc.py @@ -66,8 +66,8 @@ class EPCManagement(): self.mmeConfFile = 'mme.conf' self.yamlPath = '' self.isMagmaUsed = False - self.cfgDeploy = '--type start-mini --fqdn yes --scenario 1 --capture /tmp/oai-cn5g-v1.5.pcap' #from xml, 'mini' is default normal for docker-network.py - self.cfgUnDeploy = '--type stop-mini --fqdn yes --scenario 1' #from xml, 'mini' is default normal for docker-network.py + self.cfgDeploy = '--type start-mini --scenario 1 --capture /tmp/oai-cn5g-v1.5.pcap' #from xml, 'mini' is default normal for docker-network.py + self.cfgUnDeploy = '--type stop-mini --scenario 1' #from xml, 'mini' is default normal for docker-network.py #----------------------------------------------------------- @@ -259,12 +259,12 @@ class EPCManagement(): dFile = 'docker-compose-mini-nrf-asue.yaml' else: dFile = 'docker-compose-mini-nrf.yaml' - mySSH.command('docker-compose -p 5gcn -f ' + dFile + ' ps -a', '\$', 60) + mySSH.command('docker-compose -f ' + dFile + ' ps -a', '\$', 60) if mySSH.getBefore().count('Up (healthy)') != 6: logging.error('Not all container healthy') else: logging.debug('OK --> all containers are healthy') - mySSH.command('docker-compose -p 5gcn -f ' + dFile + ' config | grep --colour=never image', '\$', 10) + mySSH.command('docker-compose -f ' + dFile + ' config | grep --colour=never image', '\$', 10) listOfImages = mySSH.getBefore() for imageLine in listOfImages.split('\\r\\n'): res1 = re.search('image: (?P[a-zA-Z0-9\-/]+):(?P[a-zA-Z0-9\-]+)', str(imageLine)) diff --git a/ci-scripts/xml_files/sa_cn5g_asue_closure.xml b/ci-scripts/xml_files/sa_cn5g_asue_closure.xml index b856134e36..f0448d528d 100644 --- a/ci-scripts/xml_files/sa_cn5g_asue_closure.xml +++ b/ci-scripts/xml_files/sa_cn5g_asue_closure.xml @@ -32,7 +32,7 @@ Terminate_5GCN Terminate 5G Core - --type stop-mini-as-ue --fqdn yes --scenario 1 + --type stop-mini-as-ue --scenario 1 diff --git a/ci-scripts/xml_files/sa_cn5g_asue_start.xml b/ci-scripts/xml_files/sa_cn5g_asue_start.xml index 0b402f69f1..da2ae56114 100644 --- a/ci-scripts/xml_files/sa_cn5g_asue_start.xml +++ b/ci-scripts/xml_files/sa_cn5g_asue_start.xml @@ -33,7 +33,7 @@ Initialize_5GCN Initialize 5G Core - --type start-mini-as-ue --fqdn yes --scenario 1 --capture /tmp/oai-cn5g-v1.5.pcap + --type start-mini-as-ue --scenario 1 --capture /tmp/oai-cn5g-v1.5.pcap