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

Flip the sense of the test for proxymodule imports, add more fns for esxi proxy #30361

Merged
merged 13 commits into from Jan 14, 2016

Conversation

Projects
None yet
2 participants
@cro
Member

cro commented Jan 14, 2016

No description provided.

cro added some commits Jan 12, 2016

Flip the sense of the test for items (modules, etc) loaded by the pro…
…xy. Now load everything a regular minion would load, and only check to make sure __proxyenabled__ is present for proxymodules and grains
def get_dvs_portgroup_assignment(service_instance, host, dvs_name,
portgroup_name, host_names):
'''

This comment has been minimized.

@rallytime

rallytime Jan 14, 2016

Contributor

Can you add a description of what this function does, as well as a CLI function?

@rallytime

rallytime Jan 14, 2016

Contributor

Can you add a description of what this function does, as well as a CLI function?

Show outdated Hide outdated salt/modules/vsphere.py Outdated
'Adding host to the DVS',
sleep_seconds=3)
ret[host_name].update({'status': True})

This comment has been minimized.

@rallytime

rallytime Jan 14, 2016

Contributor

This function doesn't appear to return anything. Probably just needs a return ret.

@rallytime

rallytime Jan 14, 2016

Contributor

This function doesn't appear to return anything. Probably just needs a return ret.

This comment has been minimized.

@cro

cro Jan 14, 2016

Member

I just removed these two.

@cro

cro Jan 14, 2016

Member

I just removed these two.

:param dvs_name: Name of the DVS
:param portgroup_name: Portgroup to examine
:param host_names: Names of hosts
:return:

This comment has been minimized.

@rallytime

rallytime Jan 14, 2016

Contributor

This return description is empty. It also looks like this function doesn't return anything in the code below. Is that intended?

@rallytime

rallytime Jan 14, 2016

Contributor

This return description is empty. It also looks like this function doesn't return anything in the code below. Is that intended?

cro added some commits Jan 14, 2016

rallytime added a commit that referenced this pull request Jan 14, 2016

Merge pull request #30361 from cro/esxi-proxy2
Flip the sense of the test for proxymodule imports, add more fns for esxi proxy

@rallytime rallytime merged commit 40594ef into saltstack:2015.8 Jan 14, 2016

2 of 5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #11332 — FAILURE
Details
jenkins/salt-pr-rs-ubuntu14.04-n Salt PR - RS Ubuntu 14 #8820 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #12742 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #12438 — SUCCESS
Details

@cro cro deleted the cro:esxi-proxy2 branch May 25, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment