Revision 60a80953 snf-tools/synnefo_tools/burnin/common.py

b/snf-tools/synnefo_tools/burnin/common.py
44 44
import tempfile
45 45
import traceback
46 46

  
47
from kamaki.clients.cyclades import CycladesClient
47
from kamaki.clients.cyclades import CycladesClient, CycladesNetworkClient
48 48
from kamaki.clients.astakos import AstakosClient
49 49
from kamaki.clients.compute import ComputeClient
50 50
from kamaki.clients.pithos import PithosClient
......
122 122
    compute_url = None
123 123
    # Cyclades
124 124
    cyclades = None
125
    # Network
126
    network = None
127
    network_url = None
125 128
    # Pithos
126 129
    pithos = None
127 130
    pithos_url = None
......
142 145
        self.cyclades = CycladesClient(self.compute_url, self.token)
143 146
        self.cyclades.CONNECTION_RETRY_LIMIT = self.retry
144 147

  
148
        self.network_url = \
149
            self.astakos.get_service_endpoints('network')['publicURL']
150
        self.network = CycladesNetworkClient(self.network_url, self.token)
151
        self.network.CONNECTION_RETRY_LIMIT = self.retry
152

  
145 153
        self.pithos_url = self.astakos.\
146 154
            get_service_endpoints('object-store')['publicURL']
147 155
        self.pithos = PithosClient(self.pithos_url, self.token)
......
204 212
        self.clients.initialize_clients()
205 213
        self.info("Astakos auth url is %s", self.clients.auth_url)
206 214
        self.info("Cyclades url is %s", self.clients.compute_url)
215
        self.info("Network url is %s", self.clients.network_url)
207 216
        self.info("Pithos url is %s", self.clients.pithos_url)
208 217
        self.info("Image url is %s", self.clients.image_url)
209 218

  
......
216 225
                  self.quotas['system']['pithos.diskspace']['usage'])
217 226
        self.info("  Ram usage is %s bytes",
218 227
                  self.quotas['system']['cyclades.ram']['usage'])
228
        self.info("  Floating IPs usage is %s",
229
                  self.quotas['system']['cyclades.floating_ip']['usage'])
219 230
        self.info("  CPU usage is %s",
220 231
                  self.quotas['system']['cyclades.cpu']['usage'])
221 232
        self.info("  Network usage is %s",
......
490 501
    # Invalid argument name. pylint: disable-msg=C0103
491 502
    # Too many arguments. pylint: disable-msg=R0913
492 503
    def _check_quotas(self, disk=None, vm=None, diskspace=None,
493
                      ram=None, cpu=None, network=None):
504
                      ram=None, ip=None, cpu=None, network=None):
494 505
        """Check that quotas' changes are consistent"""
495 506
        assert any(v is None for v in
496
                   [disk, vm, diskspace, ram, cpu, network]), \
507
                   [disk, vm, diskspace, ram, ip, cpu, network]), \
497 508
            "_check_quotas require arguments"
498 509

  
499 510
        self.info("Check that quotas' changes are consistent")
......
513 524
        # Check Ram usage
514 525
        self._check_quotas_aux(
515 526
            old_quotas, new_quotas, 'cyclades.ram', ram)
527
        # Check Floating IPs usage
528
        self._check_quotas_aux(
529
            old_quotas, new_quotas, 'cyclades.floating_ip', ip)
516 530
        # Check CPU usage
517 531
        self._check_quotas_aux(
518 532
            old_quotas, new_quotas, 'cyclades.cpu', cpu)

Also available in: Unified diff