Revision c2f037ff snf-tools/synnefo_tools/burnin/server_tests.py

b/snf-tools/synnefo_tools/burnin/server_tests.py
44 44

  
45 45
from vncauthproxy.d3des import generate_response as d3des_generate_response
46 46

  
47
from synnefo_tools.burnin.common import BurninTests, Proper
47
from synnefo_tools.burnin.common import Proper
48 48
from synnefo_tools.burnin.cyclades_common import CycladesTests
49 49

  
50 50

  
......
290 290
# will run the same tests using different images and or flavors.
291 291
# The creation and running of our GeneratedServerTestSuite class will
292 292
# happen as a testsuite itself (everything here is a test!).
293
class ServerTestSuite(BurninTests):
293
class ServerTestSuite(CycladesTests):
294 294
    """Generate and run the GeneratedServerTestSuite
295 295

  
296 296
    We will generate as many testsuites as the number of images given.
......
303 303

  
304 304
    def test_001_images_to_use(self):
305 305
        """Find images to be used by GeneratedServerTestSuite"""
306
        if self.images is None:
307
            self.info("No --images given. Will use the default %s",
308
                      "^Debian Base$")
309
            filters = ["name:^Debian Base$"]
310
        else:
311
            filters = self.images
312

  
313
        self.avail_images = self._find_images(filters)
314
        self.info("Found %s images. Let's create an equal number of tests",
315
                  len(self.avail_images))
306
        self.avail_images = self._parse_images()
316 307

  
317 308
    def test_002_flavors_to_use(self):
318 309
        """Find flavors to be used by GeneratedServerTestSuite"""
319
        flavors = self._get_list_of_flavors(detail=True)
320

  
321
        if self.flavors is None:
322
            self.info("No --flavors given. Will use all of them")
323
            self.avail_flavors = flavors
324
        else:
325
            self.avail_flavors = self._find_flavors(
326
                self.flavors, flavors=flavors)
327
        self.info("Found %s flavors to choose from", len(self.avail_flavors))
310
        self.avail_flavors = self._parse_flavors()
328 311

  
329 312
    def test_003_create_testsuites(self):
330 313
        """Generate the GeneratedServerTestSuite tests"""

Also available in: Unified diff