Revision 3e5bbd85 snf-tools/synnefo_tools/burnin/cyclades_common.py

b/snf-tools/synnefo_tools/burnin/cyclades_common.py
46 46
import tempfile
47 47
import subprocess
48 48

  
49
from synnefo_tools.burnin.common import BurninTests
49
from synnefo_tools.burnin.common import BurninTests, MB, GB
50 50

  
51 51

  
52 52
# Too many public methods. pylint: disable-msg=R0904
......
127 127
        self.assertEqual(server['image']['id'], image['id'])
128 128
        self.assertEqual(server['status'], "BUILD")
129 129

  
130
        # Verify quotas
131
        self._check_quotas(disk=+int(flavor['disk'])*GB,
132
                           vm=+1,
133
                           ram=+int(flavor['ram'])*MB,
134
                           cpu=+int(flavor['vcpus']))
135

  
130 136
        return server
131 137

  
138
    def _verify_quotas_deleted(self, flavors):
139
        """Verify quotas for a number of deleted servers"""
140
        used_disk = 0
141
        used_vm = 0
142
        used_ram = 0
143
        used_cpu = 0
144
        for flavor in flavors:
145
            used_disk += int(flavor['disk']) * GB
146
            used_vm += 1
147
            used_ram += int(flavor['ram']) * MB
148
            used_cpu += int(flavor['vcpus'])
149
        self._check_quotas(disk=-used_disk,
150
                           vm=-used_vm,
151
                           ram=-used_ram,
152
                           cpu=-used_cpu)
153

  
132 154
    def _get_connection_username(self, server):
133 155
        """Determine the username to use to connect to the server"""
134 156
        users = server['metadata'].get("users", None)
......
360 382
        self.assertIsNotNone(nid, "Could not find network card")
361 383
        self.clients.cyclades.disconnect_server(server['id'], nid)
362 384

  
385
    def _create_network(self, name, cidr="10.0.1.0/28", dhcp=True):
386
        """Create a new private network"""
387
        network = self.clients.cyclades.create_network(
388
            name, cidr=cidr, dhcp=dhcp)
389
        self.info("Network with id %s created", network['id'])
390

  
391
        # Verify quotas
392
        self._check_quotas(network=+1)
393

  
394
        #Test if the right name is assigned
395
        self.assertEqual(network['name'], name)
396

  
397
        return network
398

  
363 399

  
364 400
class Retry(Exception):
365 401
    """Retry the action

Also available in: Unified diff