You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2016/10/13 09:21:06 UTC
[1/2] git commit: updated refs/heads/master to 8d1f1a6
Repository: cloudstack
Updated Branches:
refs/heads/master f3b132f63 -> 8d1f1a69a
[CLOUDSTACK-9337]Enhance vcenter.py to created data center in vcenter server automatically
(Programmatically)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8daaa30f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8daaa30f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8daaa30f
Branch: refs/heads/master
Commit: 8daaa30fc895b2e54bf4adaea01429008c5b368a
Parents: 419f8fb
Author: sanjeevn <sa...@citrix.com>
Authored: Mon Mar 21 18:22:08 2016 +0530
Committer: sanjeev <sa...@accelerite.com>
Committed: Tue Apr 5 17:43:28 2016 +0530
----------------------------------------------------------------------
tools/marvin/marvin/lib/vcenter.py | 169 +++++++++++++++++++++++++++++++-
1 file changed, 164 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8daaa30f/tools/marvin/marvin/lib/vcenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/lib/vcenter.py b/tools/marvin/marvin/lib/vcenter.py
index f7e0987..d14f364 100644
--- a/tools/marvin/marvin/lib/vcenter.py
+++ b/tools/marvin/marvin/lib/vcenter.py
@@ -19,9 +19,12 @@ from pyVmomi import vim, vmodl
from pyVim import connect
import atexit
import ssl
-if hasattr(ssl, '_create_unverified_context'):
- ssl._create_default_https_context = ssl._create_unverified_context
+import subprocess
+import time
+import json
+if hasattr(ssl, '_create_unverified_context'):
+ ssl._create_default_https_context = ssl._create_unverified_context()
class Vcenter():
@@ -29,9 +32,15 @@ class Vcenter():
"""
create a service_instance object
"""
- self.service_instance = connect.SmartConnect(host=host,
- user=user,
- pwd=pwd)
+ if hasattr(ssl, '_create_default_https_context'):
+ self.service_instance = connect.SmartConnect(host=host,
+ user=user,
+ pwd=pwd,
+ sslContext=ssl._create_default_https_context)
+ else:
+ self.service_instance = connect.SmartConnect(host=host,
+ user=user,
+ pwd=pwd)
atexit.register(connect.Disconnect, self.service_instance)
@staticmethod
@@ -183,7 +192,157 @@ class Vcenter():
"""
pass
+ def create_datacenter(self, dcname=None, service_instance=None, folder=None):
+ """
+ Creates a new datacenter with the given name.
+ Any % (percent) character used in this name parameter must be escaped,
+ unless it is used to start an escape sequence. Clients may also escape
+ any other characters in this name parameter.
+
+ An entity name must be a non-empty string of
+ less than 80 characters. The slash (/), backslash (\) and percent (%)
+ will be escaped using the URL syntax. For example, %2F
+
+ This can raise the following exceptions:
+ vim.fault.DuplicateName
+ vim.fault.InvalidName
+ vmodl.fault.NotSupported
+ vmodl.fault.RuntimeFault
+ ValueError raised if the name len is > 79
+ https://github.com/vmware/pyvmomi/blob/master/docs/vim/Folder.rst
+
+ Required Privileges
+ Datacenter.Create
+
+ :param folder: Folder object to create DC in. If None it will default to
+ rootFolder
+ :param dcname: Name for the new datacenter.
+ :param service_instance: ServiceInstance connection to a given vCenter
+ :return:
+ """
+ if len(dcname) > 79:
+ raise ValueError("The name of the datacenter must be under "
+ "80 characters.")
+
+ if folder is None:
+ folder = self.service_instance.content.rootFolder
+
+ if folder is not None and isinstance(folder, vim.Folder):
+ dc_moref = folder.CreateDatacenter(name=dcname)
+ return dc_moref
+
+ def create_cluster(self, cluster_name, datacenter):
+ """
+ Method to create a Cluster in vCenter
+
+ :param cluster_name: Name of the cluster
+ :param datacenter: Name of the data center
+ :return: Cluster MORef
+ """
+ # cluster_name = kwargs.get("name")
+ # cluster_spec = kwargs.get("cluster_spec")
+ # datacenter = kwargs.get("datacenter")
+
+ if cluster_name is None:
+ raise ValueError("Missing value for name.")
+ if datacenter is None:
+ raise ValueError("Missing value for datacenter.")
+
+ cluster_spec = vim.cluster.ConfigSpecEx()
+
+ host_folder = datacenter.hostFolder
+ cluster = host_folder.CreateClusterEx(name=cluster_name, spec=cluster_spec)
+ return cluster
+
+ def add_host(self, cluster, hostname, sslthumbprint, username, password):
+ """
+ Method to add host in a vCenter Cluster
+
+ :param cluster_name
+ :param hostname
+ :param username
+ :param password
+ """
+ if hostname is None:
+ raise ValueError("Missing value for name.")
+ try:
+ hostspec = vim.host.ConnectSpec(hostName=hostname,
+ userName=username,
+ sslThumbprint=sslthumbprint,
+ password=password,
+ force=True)
+ task = cluster.AddHost(spec=hostspec, asConnected=True)
+ except Exception as e:
+ print "Error adding host :%s" % e
+ self.wait_for_task(task)
+ host = self._get_obj([vim.HostSystem], hostname)
+ return host
+
+ def create_datacenters(self, config):
+ """
+ Method to create data centers in vCenter server programmatically
+ It expects configuration data in the form of dictionary.
+ configuration file is same as the one we pass to deployDataCenter.py for creating
+ datacenter in CS
+
+ :param config:
+ :return:
+ """
+ zones = config['zones']
+ try:
+ for zone in zones:
+ dc_obj = self.create_datacenter(zone['name'])
+ for pod in zone['pods']:
+ for cluster in pod['clusters']:
+ clustername = cluster['clustername'].split('/')[-1]
+ cluster_obj = self.create_cluster(
+ cluster_name=clustername,
+ datacenter=dc_obj
+ )
+ for host in cluster['hosts']:
+ host_ip = host['url'].split("//")[-1]
+ user = host['username']
+ passwd = host['password']
+ sslthumbprint=self.getsslThumbprint(host_ip)
+ self.add_host(cluster=cluster_obj,
+ hostname=host_ip,
+ sslthumbprint=sslthumbprint,
+ username=user,
+ password=passwd)
+ except Exception as e:
+ print "Failed to create datacenter: %s" % e
+
+ def wait_for_task(self, task):
+
+ while task.info.state == (vim.TaskInfo.State.running or vim.TaskInfo.State.queued):
+ time.sleep(2)
+
+ if task.info.state == vim.TaskInfo.State.success:
+ if task.info.result is not None:
+ out = 'Task completed successfully, result: %s' % (task.info.result,)
+ print out
+ elif task.info.state == vim.TaskInfo.State.error:
+ out = 'Error - Task did not complete successfully: %s' % (task.info.error,)
+ raise ValueError(out)
+ return task.info.result
+
+ def getsslThumbprint(self,ip):
+ p1 = subprocess.Popen(('echo', '-n'), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ p2 = subprocess.Popen(('openssl', 's_client', '-connect', '{0}:443'.format(ip)),
+ stdin=p1.stdout,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE
+ )
+ p3 = subprocess.Popen(('openssl', 'x509', '-noout', '-fingerprint', '-sha1'),
+ stdin=p2.stdout,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE
+ )
+ out = p3.stdout.read()
+ ssl_thumbprint = out.split('=')[-1].strip()
+ return ssl_thumbprint
+
if __name__ == '__main__':
vc_object = Vcenter("10.x.x.x", "username", "password")
[2/2] git commit: updated refs/heads/master to 8d1f1a6
Posted by ra...@apache.org.
Merge pull request #1464 from sanju1010/vcenter
[CLOUDSTACK-9337]Enhance vcenter.py to create data center in vcenter server automaticallyThese changes have been made to support vmware deployments in CI.
For CI to create cloudstack setup with vmware, it is required to create datacenter, cluster and hosts in vcenter server before adding in cloudstack. Added few methods in vcenter.py to perform these tasks.
Please refer to CLOUDSTACK-9337 for more details.
* pr/1464:
[CLOUDSTACK-9337]Enhance vcenter.py to created data center in vcenter server automatically (Programmatically)
Signed-off-by: Rajani Karuturi <ra...@accelerite.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8d1f1a69
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8d1f1a69
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8d1f1a69
Branch: refs/heads/master
Commit: 8d1f1a69a07272e482cfa5bf49ce7dfd9f9e2233
Parents: f3b132f 8daaa30
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Thu Oct 13 14:50:53 2016 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Thu Oct 13 14:50:53 2016 +0530
----------------------------------------------------------------------
tools/marvin/marvin/lib/vcenter.py | 169 +++++++++++++++++++++++++++++++-
1 file changed, 164 insertions(+), 5 deletions(-)
----------------------------------------------------------------------