Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix aliyun cloud typeerror #49650

Merged
merged 3 commits into from Sep 30, 2018

Conversation

Projects
None yet
2 participants
@Yxnt
Copy link
Contributor

commented Sep 14, 2018

What does this PR do?

fix cloud aliyun TypeError

Previous Behavior

[root@localhost]# salt-cloud --location=cn-shanghai -f list_nodes xxxx
........
TypeError: character mapping must return integer, None or unicode

New Behavior

[root@localhost]# salt-cloud --location=cn-shanghai -f list_nodes xxxx

xxxx:
    ----------
    aliyun:
        ----------
        secret:
            ----------
            id:
                secret
            name:
                secret
            private_ips:
                - xxx.xxx.xxx.xxx
            public_ips:
                - xx.xxx.xxx.xxx
            size:
                TODO
            state:
                Running

Tests written?

No

Commits signed with GPG?

No

@salt-jenkins salt-jenkins requested a review from saltstack/team-cloud Sep 14, 2018

@rallytime
Copy link
Contributor

left a comment

Hello @Yxnt! Thank you for submitting this fix. I have one suggestion.

Can you also move this change to the 2018.3 branch? We're finishing up some release tasks on the 2018.3.3 branch and it's closed to fixes currently.

Show resolved Hide resolved salt/cloud/clouds/aliyun.py Outdated

@Yxnt Yxnt changed the base branch from 2018.3.3 to develop Sep 28, 2018

@Yxnt

This comment has been minimized.

Copy link
Contributor Author

commented Sep 29, 2018

@rallytime I‘m so sorry for my last commit b18095e, I'm so busy today, I might be wrong.

@rallytime

This comment has been minimized.

Copy link
Contributor

commented Sep 30, 2018

@Yxnt This is great. Thank you so much for your submission and welcome to the Salt contributors community!

@rallytime rallytime merged commit 424062f into saltstack:develop Sep 30, 2018

5 of 11 checks passed

jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
continuous-integration/jenkins/pr-merge This commit is being built
Details
jenkins/pr/py2-ubuntu-1604 running py2-ubuntu-1604...
Details
WIP ready for review
Details
codeclimate All good!
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details

rallytime added a commit that referenced this pull request Oct 1, 2018

@Yxnt Yxnt deleted the Yxnt:fix-aliyuncloud_TypeError branch Oct 3, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.