Skip to content

Fixed port_alias config processing#874

Merged
liat-grozovik merged 1 commit intosonic-net:masterfrom
nazariig:master-port-alias-fix
Apr 17, 2019
Merged

Fixed port_alias config processing#874
liat-grozovik merged 1 commit intosonic-net:masterfrom
nazariig:master-port-alias-fix

Conversation

@nazariig
Copy link
Contributor

Signed-off-by: Nazarii Hnydyn nazariig@mellanox.com

Description of PR

Fixed port_alias config processing: added logic to get platform type directly from ONiE string

Type of change

  • Bug fix

Approach

How did you do it?

  • Changed port_config.ini path generation logic based on ONiE string

How did you verify/test it?

  • Executed relevant test cases

Any platform specific information?

  • N/A

Supported testbed topology if it's a new test case?

  • N/A

Documentation

  • N/A

Signed-off-by: Nazarii Hnydyn <nazariig@mellanox.com>
@liat-grozovik liat-grozovik merged commit 0e0b807 into sonic-net:master Apr 17, 2019
@robert1030
Copy link

Hi:
To Found new issue for virtual switch test, after port_alias.py be merged new fix code.

Old port_alias.py for Virtual Switch Test(Pass for check):
TASK [vm_set : Get DUT port alias] *********************************************
task path: /var/sqa/sonic-mgmt/ansible/roles/vm_set/tasks/start_sonic_vm.yml:24
Friday 26 April 2019 00:40:12 +0000 (0:00:00.085) 0:00:27.324 **********
ESTABLISH LOCAL CONNECTION FOR USER: sqa
172.17.0.1 EXEC ( umask 22 && mkdir -p "$( echo $HOME/.ansible/tmp/ansible-tmp-1556239212.75-145824139745272 )" &amp;&amp; echo "$( echo $HOME/.ansible/tmp/ansible-tmp-1556239212.75-145824139745272 )" )
172.17.0.1 PUT /tmp/tmpTjpo29 TO /var/sqa/.ansible/tmp/ansible-tmp-1556239212.75-145824139745272/port_alias
172.17.0.1 EXEC LANG=C LC_ALL=C LC_MESSAGES=C /usr/bin/env python /var/sqa/.ansible/tmp/ansible-tmp-1556239212.75-145824139745272/port_alias; rm -rf "/var/sqa/.ansible/tmp/ansible-tmp-1556239212.75-145824139745272/" > /dev/null 2>&1
ok: [STR-ACS-VSERV-01] => {"ansible_facts": {"port_alias": ["fortyGigE0/0", "fortyGigE0/4", "fortyGigE0/8", "fortyGigE0/12", "fortyGigE0/16", "fortyGigE0/20", "fortyGigE0/24", "fortyGigE0/28", "fortyGigE0/32", "fortyGigE0/36", "fortyGigE0/40", "fortyGigE0/44", "fortyGigE0/48", "fortyGigE0/52", "fortyGigE0/56", "fortyGigE0/60", "fortyGigE0/64", "fortyGigE0/68", "fortyGigE0/72", "fortyGigE0/76", "fortyGigE0/80", "fortyGigE0/84", "fortyGigE0/88", "fortyGigE0/92", "fortyGigE0/96", "fortyGigE0/100", "fortyGigE0/104", "fortyGigE0/108", "fortyGigE0/112", "fortyGigE0/116", "fortyGigE0/120", "fortyGigE0/124"], "port_alias_map": {"fortyGigE0/0": "Ethernet0", "fortyGigE0/100": "Ethernet100", "fortyGigE0/104": "Ethernet104", "fortyGigE0/108": "Ethernet108", "fortyGigE0/112": "Ethernet112", "fortyGigE0/116": "Ethernet116", "fortyGigE0/12": "Ethernet12", "fortyGigE0/120": "Ethernet120", "fortyGigE0/124": "Ethernet124", "fortyGigE0/16": "Ethernet16", "fortyGigE0/20": "Ethernet20", "fortyGigE0/24": "Ethernet24", "fortyGigE0/28": "Ethernet28", "fortyGigE0/32": "Ethernet32", "fortyGigE0/36": "Ethernet36", "fortyGigE0/4": "Ethernet4", "fortyGigE0/40": "Ethernet40", "fortyGigE0/44": "Ethernet44", "fortyGigE0/48": "Ethernet48", "fortyGigE0/52": "Ethernet52", "fortyGigE0/56": "Ethernet56", "fortyGigE0/60": "Ethernet60", "fortyGigE0/64": "Ethernet64", "fortyGigE0/68": "Ethernet68", "fortyGigE0/72": "Ethernet72", "fortyGigE0/76": "Ethernet76", "fortyGigE0/8": "Ethernet8", "fortyGigE0/80": "Ethernet80", "fortyGigE0/84": "Ethernet84", "fortyGigE0/88": "Ethernet88", "fortyGigE0/92": "Ethernet92", "fortyGigE0/96": "Ethernet96"}, "port_name_map": {"Ethernet0": "fortyGigE0/0", "Ethernet100": "fortyGigE0/100", "Ethernet104": "fortyGigE0/104", "Ethernet108": "fortyGigE0/108", "Ethernet112": "fortyGigE0/112", "Ethernet116": "fortyGigE0/116", "Ethernet12": "fortyGigE0/12", "Ethernet120": "fortyGigE0/120", "Ethernet124": "fortyGigE0/124", "Ethernet16": "fortyGigE0/16", "Ethernet20": "fortyGigE0/20", "Ethernet24": "fortyGigE0/24", "Ethernet28": "fortyGigE0/28", "Ethernet32": "fortyGigE0/32", "Ethernet36": "fortyGigE0/36", "Ethernet4": "fortyGigE0/4", "Ethernet40": "fortyGigE0/40", "Ethernet44": "fortyGigE0/44", "Ethernet48": "fortyGigE0/48", "Ethernet52": "fortyGigE0/52", "Ethernet56": "fortyGigE0/56", "Ethernet60": "fortyGigE0/60", "Ethernet64": "fortyGigE0/64", "Ethernet68": "fortyGigE0/68", "Ethernet72": "fortyGigE0/72", "Ethernet76": "fortyGigE0/76", "Ethernet8": "fortyGigE0/8", "Ethernet80": "fortyGigE0/80", "Ethernet84": "fortyGigE0/84", "Ethernet88": "fortyGigE0/88", "Ethernet92": "fortyGigE0/92", "Ethernet96": "fortyGigE0/96"}, "port_speed": {"fortyGigE0/0": "40000", "fortyGigE0/100": "40000", "fortyGigE0/104": "40000", "fortyGigE0/108": "40000", "fortyGigE0/112": "40000", "fortyGigE0/116": "40000", "fortyGigE0/12": "40000", "fortyGigE0/120": "40000", "fortyGigE0/124": "40000", "fortyGigE0/16": "40000", "fortyGigE0/20": "40000", "fortyGigE0/24": "40000", "fortyGigE0/28": "40000", "fortyGigE0/32": "40000", "fortyGigE0/36": "40000", "fortyGigE0/4": "40000", "fortyGigE0/40": "40000", "fortyGigE0/44": "40000", "fortyGigE0/48": "40000", "fortyGigE0/52": "40000", "fortyGigE0/56": "40000", "fortyGigE0/60": "40000", "fortyGigE0/64": "40000", "fortyGigE0/68": "40000", "fortyGigE0/72": "40000", "fortyGigE0/76": "40000", "fortyGigE0/8": "40000", "fortyGigE0/80": "40000", "fortyGigE0/84": "40000", "fortyGigE0/88": "40000", "fortyGigE0/92": "40000", "fortyGigE0/96": "40000"}}, "changed": false, "invocation": {"module_args": {"hwsku": "Force10-S6000"}, "module_name": "port_alias"}}

New port_alias.py for Virtual Switch Test(Failed for check):
TASK [vm_set : Get DUT port alias] *********************************************
task path: /var/sqa/sonic-mgmt/ansible/roles/vm_set/tasks/start_sonic_vm.yml:25
Friday 26 April 2019 01:46:45 +0000 (0:00:20.876) 0:00:34.059 **********
ESTABLISH LOCAL CONNECTION FOR USER: sqa
172.17.0.1 EXEC ( umask 22 && mkdir -p "$( echo $HOME/.ansible/tmp/ansible-tmp-1556243205.67-22248365415391 )" &amp;&amp; echo "$( echo $HOME/.ansible/tmp/ansible-tmp-1556243205.67-22248365415391 )" )
172.17.0.1 PUT /tmp/tmpJNQYhD TO /var/sqa/.ansible/tmp/ansible-tmp-1556243205.67-22248365415391/port_alias
172.17.0.1 EXEC LANG=C LC_ALL=C LC_MESSAGES=C /usr/bin/env python /var/sqa/.ansible/tmp/ansible-tmp-1556243205.67-22248365415391/port_alias; rm -rf "/var/sqa/.ansible/tmp/ansible-tmp-1556243205.67-22248365415391/" > /dev/null 2>&1
fatal: [STR-ACS-VSERV-01]: FAILED! => {"changed": false, "failed": true, "invocation": {"module_args": {"hwsku": "Force10-S6000"}, "module_name": "port_alias"}, "msg": "IO error[Errno 2] No such file or directory: '/host/machine.conf'"}

Virtual Sonic Switch image build version: #166
https://sonic-jenkins.westus2.cloudapp.azure.com/job/vs/job/buildimage-vs-image/166/artifact/target/sonic-vs.img.gz

@jipanyang
Copy link

This PR broke vsonic testbed test at ./testbed-cli.sh -t vtestbed.csv -m veos.vtb add-topo vms-kvm-t0 password.txt

virtual Force10-S6000 doesn't have '/host/machine.conf' file available.

@nazariig
Copy link
Contributor Author

@jipanyang Fixed: #892

stepanblyschak pushed a commit to stepanblyschak/sonic-mgmt that referenced this pull request Jun 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants