Add create instances 37/34537/13
authordongwenjuan <dong.wenjuan@zte.com.cn>
Wed, 10 May 2017 07:21:38 +0000 (15:21 +0800)
committerwenjuan dong <dong.wenjuan@zte.com.cn>
Fri, 7 Jul 2017 06:18:42 +0000 (06:18 +0000)
JIRA: DOCTOR-93

Change-Id: I7645c1cc0c76ff86b9fbcc01c19038469fc9b9b4
Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
tests/config.py
tests/identity_auth.py
tests/instance.py [new file with mode: 0644]
tests/main.py
tests/network.py [new file with mode: 0644]
tests/os_clients.py

index 3cacd0a..99f335f 100644 (file)
@@ -11,6 +11,8 @@ import itertools
 from oslo_config import cfg\r
 \r
 import image\r
+import instance\r
+import network\r
 import os_clients\r
 import user\r
 \r
@@ -20,7 +22,9 @@ def list_opts():
         ('DEFAULT', itertools.chain(\r
             os_clients.OPTS,\r
             image.OPTS,\r
-            user.OPTS))\r
+            user.OPTS,\r
+            network.OPTS,\r
+            instance.OPTS))\r
     ]\r
 \r
 \r
index ffecc68..c94893f 100644 (file)
@@ -13,13 +13,14 @@ from keystoneauth1 import loading
 from keystoneauth1 import session
 
 
-def get_identity_auth():
+def get_identity_auth(username=None, password=None, project=None):
     auth_url = os.environ['OS_AUTH_URL']
-    username = os.environ['OS_USERNAME']
-    password = os.environ['OS_PASSWORD']
+    username = username or os.environ['OS_USERNAME']
+    password = password or os.environ['OS_PASSWORD']
     user_domain_name = os.environ.get('OS_USER_DOMAIN_NAME') or 'default'
     user_domain_id = os.environ.get('OS_USER_DOMAIN_ID') or 'default'
-    project_name = os.environ.get('OS_PROJECT_NAME') or os.environ.get('OS_TENANT_NAME')
+    project_name = project or os.environ.get('OS_PROJECT_NAME') \
+                   or os.environ.get('OS_TENANT_NAME')
     project_domain_name = os.environ.get('OS_PROJECT_DOMAIN_NAME') or 'default'
     project_domain_id = os.environ.get('OS_PROJECT_DOMAIN_ID') or 'default'
 
diff --git a/tests/instance.py b/tests/instance.py
new file mode 100644 (file)
index 0000000..c6acbc3
--- /dev/null
@@ -0,0 +1,114 @@
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+import os
+import time
+
+from oslo_config import cfg
+
+from identity_auth import get_identity_auth
+from identity_auth import get_session
+from os_clients import neutron_client
+from os_clients import nova_client
+
+OPTS = [
+    cfg.StrOpt('flavor',
+               default='m1.tiny',
+               help='the name of flavor',
+               required=True),
+    cfg.IntOpt('instance_count',
+               default=os.environ.get('VM_COUNT', 1),
+               help='the count of instance',
+               required=True),
+    cfg.StrOpt('instance_basename',
+               default='doctor_vm',
+               help='the base name of instance',
+               required=True),
+]
+
+
+class Instance(object):
+
+    def __init__(self, conf, log):
+        self.conf = conf
+        self.log = log
+        self.auth = get_identity_auth(username=self.conf.doctor_user,
+                                      password=self.conf.doctor_passwd,
+                                      project=self.conf.doctor_project)
+        self.nova = \
+            nova_client(conf.nova_version,
+                        get_session(auth=self.auth))
+        self.neutron = neutron_client(get_session(auth=self.auth))
+        self.servers = {}
+        self.vm_names = []
+
+    def create(self):
+        self.log.info('instance create start......')
+
+        # get flavor, image and network for vm boot
+        flavors = {flavor.name: flavor for flavor in self.nova.flavors.list()}
+        flavor = flavors.get(self.conf.flavor)
+        image = self.nova.glance.find_image(self.conf.image_name)
+        network = self.neutron.list_networks(name=self.conf.net_name)['networks'][0]
+        nics = {'net-id': network['id']}
+
+        self.servers = \
+            {getattr(server, 'name'): server
+             for server in self.nova.servers.list()}
+        for i in range(0, self.conf.instance_count):
+            vm_name = "%s%d"%(self.conf.instance_basename, i)
+            self.vm_names.append(vm_name)
+            if vm_name not in self.servers:
+                server = self.nova.servers.create(vm_name, image,
+                                                  flavor, nics=[nics])
+                self.servers[vm_name] = server
+                time.sleep(0.1)
+
+        self.log.info('instance create end......')
+
+    def delete(self):
+        self.log.info('instance delete start.......')
+
+        for vm_name in self.vm_names:
+            if vm_name in self.servers:
+                self.nova.servers.delete(self.servers[vm_name])
+                time.sleep(0.1)
+
+        # check that all vms are deleted
+        while self.nova.servers.list():
+            time.sleep(0.1)
+        self.servers.clear()
+        del self.vm_names[:]
+
+        self.log.info('instance delete end.......')
+
+    def wait_for_vm_launch(self):
+        self.log.info('wait for vm launch start......')
+
+        wait_time = 60
+        count = 0
+        while count < wait_time:
+            active_count = 0
+            for vm_name in self.vm_names:
+                server = self.nova.servers.get(self.servers[vm_name])
+                server_status = getattr(server, 'status').lower()
+                if 'active' == server_status:
+                    active_count += 1
+                elif 'error' == server_status:
+                    raise Exception('vm launched with error state')
+                else:
+                    time.sleep(2)
+                    count += 1
+                    continue
+            if active_count == self.conf.instance_count:
+                self.log.info('wait for vm launch end......')
+                return
+            count += 1
+            time.sleep(2)
+        raise Exception('time out for vm launch')
+
index bb2c912..540a924 100644 (file)
@@ -12,9 +12,10 @@ import sys
 
 import config
 from image import Image
+from instance import Instance
 import logger as doctor_log
 from user import User
-
+from network import Network
 
 LOG = doctor_log.Logger('doctor').getLogger()
 
@@ -25,6 +26,8 @@ class DoctorTest(object):
         self.conf = conf
         self.image = Image(self.conf, LOG)
         self.user = User(self.conf, LOG)
+        self.network = Network(self.conf, LOG)
+        self.instance = Instance(self.conf, LOG)
 
     def setup(self):
         # prepare the cloud env
@@ -36,6 +39,11 @@ class DoctorTest(object):
         self.user.create()
         self.user.update_quota()
 
+        # creating VM...
+        self.network.create()
+        self.instance.create()
+        self.instance.wait_for_vm_launch()
+
     def run(self):
         """run doctor test"""
         try:
@@ -54,6 +62,8 @@ class DoctorTest(object):
             self.cleanup()
 
     def cleanup(self):
+        self.instance.delete()
+        self.network.delete()
         self.image.delete()
         self.user.delete()
 
diff --git a/tests/network.py b/tests/network.py
new file mode 100644 (file)
index 0000000..da7ad09
--- /dev/null
@@ -0,0 +1,68 @@
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+from oslo_config import cfg
+
+from identity_auth import get_identity_auth
+from identity_auth import get_session
+from os_clients import neutron_client
+
+
+OPTS = [
+    cfg.StrOpt('net_name',
+               default='doctor_net',
+               help='the name of test net',
+               required=True),
+    cfg.StrOpt('net_cidr',
+               default='192.168.168.0/24',
+               help='the cidr of test subnet',
+               required=True),
+]
+
+
+class Network(object):
+
+    def __init__(self, conf, log):
+        self.conf = conf
+        self.log = log
+        self.auth = get_identity_auth(username=self.conf.doctor_user,
+                                      password=self.conf.doctor_passwd,
+                                      project=self.conf.doctor_project)
+        self.neutron = neutron_client(get_session(auth=self.auth))
+        self.net = None
+        self.subnet = None
+
+    def create(self):
+        self.log.info('network create start.......')
+        net_name = self.conf.net_name
+        networks = self.neutron.list_networks(name=net_name)['networks']
+        self.net = networks[0] if networks \
+            else self.neutron.create_network(
+            {'network': {'name': net_name}})['network']
+        self.log.info('network create end.......')
+
+        self.log.info('subnet create start.......')
+        subnets = self.neutron.list_subnets(network_id=self.net['id'])['subnets']
+        subnet_param = {'name': net_name, 'network_id': self.net['id'],
+                        'cidr': self.conf.net_cidr, 'ip_version': 4,
+                        'enable_dhcp': False}
+        self.subnet = subnets[0] if subnets \
+            else self.neutron.create_subnet(
+            {'subnet': subnet_param})['subnet']
+        self.log.info('subnet create end.......')
+
+    def delete(self):
+        self.log.info('subnet delete start.......')
+        if self.subnet:
+            self.neutron.delete_subnet(self.subnet['id'])
+        self.log.info('subnet delete end.......')
+
+        self.log.info('network delete start.......')
+        if self.net:
+            self.neutron.delete_network(self.net['id'])
+        self.log.info('network delete end.......')
index c9eb0b1..5f6d452 100644 (file)
@@ -10,8 +10,10 @@ from oslo_config import cfg
 \r
 import glanceclient.client as glanceclient\r
 from keystoneclient.v2_0 import client as ks_client\r
+from neutronclient.v2_0 import client as neutronclient\r
 import novaclient.client as novaclient\r
 \r
+\r
 OPTS = [\r
     cfg.StrOpt('glance_version', default='2', help='glance version'),\r
     cfg.StrOpt('nova_version', default='2.34', help='Nova version'),\r
@@ -30,3 +32,7 @@ def keystone_client(session):
 def nova_client(version, session):\r
     return novaclient.Client(version=version,\r
                              session=session)\r
+\r
+\r
+def neutron_client(session):\r
+    return neutronclient.Client(session=session)\r