Mirrors/vsphere-automation-sdk-python
1
0
Fork 0
mirror of https://github.com/vmware/vsphere-automation-sdk-python.git synced 2024-11-26 03:10:00 -05:00
Code

Incorporated Review comments. Moved new command line arg addition to sample. Deleted create_verified_session() method. Modified connect method to assign cert_path if cert_path is provided

Browse Source 
Signed-off-by: Pavan Bidkar <pbidkar@vmware.com>
This commit is contained in:
pgbidkar 2017-07-07 15:43:53 +05:30
parent e96de924f8
commit 704bbe6352
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/vsphere/common/vapiconnect.py
View File

@ -31,7 +31,7 @@ def get_jsonrpc_endpoint_url(host):
return "https://{}/api".format(host) return "https://{}/api".format(host)
def connect(host, user, pwd, skip_verification=False, suppress_warning=True): def connect(host, user, pwd, skip_verification=False, cert_path=None, suppress_warning=True):
""" """
Create an authenticated stub configuration object that can be used to issue Create an authenticated stub configuration object that can be used to issue
requests against vCenter. requests against vCenter.
@ -44,6 +44,8 @@ def connect(host, user, pwd, skip_verification=False, suppress_warning=True):
session = requests.Session() session = requests.Session()
if skip_verification: if skip_verification:
session = create_unverified_session(session, suppress_warning) session = create_unverified_session(session, suppress_warning)
elif cert_path:
session.verify = cert_path
connector = get_requests_connector(session=session, url=host_url) connector = get_requests_connector(session=session, url=host_url)
stub_config = StubConfigurationFactory.new_std_configuration(connector) stub_config = StubConfigurationFactory.new_std_configuration(connector)

31
samples/vsphere/vcenter/vm/list_vms.py
View File

@ -14,10 +14,14 @@
""" """
import atexit import atexit
import socket
import re
from samples.vsphere.common import vapiconnect from samples.vsphere.common import vapiconnect
from samples.vsphere.common.sample_util import parse_cli_args from samples.vsphere.common.sample_util import parse_cli_args
from samples.vsphere.common.sample_util import pp from samples.vsphere.common.sample_util import pp
from com.vmware.vcenter_client import VM from com.vmware.vcenter_client import VM
from samples.vsphere.common.sample_cli import build_arg_parser
from samples.vsphere.common.sample_util import process_cli_args
""" """
Demonstrates getting list of VMs present in vCenter Demonstrates getting list of VMs present in vCenter
@ -30,10 +34,31 @@ cleardata = False
def setup(context=None): def setup(context=None):
global stub_config, cleardata global stub_config, cleardata, cert_path
server, username, password, cleardata, skip_verification = parse_cli_args() parser = build_arg_parser()
parser.add_argument('-cpath', '--cert_path',
action='store',
help='Verify vCenter Server certificate')
args = parser.parse_args()
server, username, password, cleardata, skip_verification = process_cli_args(args)
# Check if either of skipverification or cert_path is passed as an argument
cert_path = None
if args.cert_path:
if re.match('\d+[.]\d+[.]\d+[.]\d+', server):
try:
server = socket.gethostbyaddr(server)[0]
except Exception as e:
print("SERVER IS NOT REACHABLE {}".format(e))
cert_path = args.cert_path
if not skip_verification and not cert_path:
raise Exception("skipverification or cert_path required")
print("cert_path = {}".format(cert_path))
# Connect to VAPI
stub_config = vapiconnect.connect(server, username, password, stub_config = vapiconnect.connect(server, username, password,
skip_verification) skip_verification, cert_path=cert_path)
atexit.register(vapiconnect.logout, stub_config) atexit.register(vapiconnect.logout, stub_config)