changes integration tests #64
Conversation
-api usage changes -bugfixes
| class DiskHelper(object): | ||
| """ | ||
| DiskHelper class | ||
| """ | ||
|
|
||
| def __init__(self): | ||
| from ..helpers.storagerouter import StoragerouterHelper |
| @@ -45,14 +46,36 @@ def __eq__(self, o): | |||
| def __str__(self): | |||
| return "{} {} {} {} {} {}".format(self.device, self.mountpoint, self.filesystem, self.options, self.d, self.p) | |||
|
|
|||
| def get(self, item): | |||
| if not isinstance(item,basestring): | |||
| self.truncate() | ||
| return True | ||
| with open(cls._path, 'r+') as fh: | ||
| d = fh.readlines() |
There was a problem hiding this comment.
Use some meaningfull names here
|
|
||
|
|
||
| class FstabHelper(file): | ||
| class FstabHelper(): |
There was a problem hiding this comment.
Inherit from object instead of nothing
|
|
||
|
|
||
| class FstabHelper(file): | ||
| class FstabHelper(): | ||
| """ | ||
| Class to help with Fstab manipulations | ||
| Inherits from file class | ||
| """ | ||
| import os |
There was a problem hiding this comment.
Imports belong to the top
| @staticmethod | ||
| def create_snapshot(snapshot_name, vdisk_name, vpool_name, api, consistent=True, sticky=True, | ||
| @classmethod | ||
| def create_snapshot(snapshot_name, vdisk_name, vpool_name, consistent=True, sticky=True, |
There was a problem hiding this comment.
Missing cls declaration. Snapshot_name is currently treated as the VDiskSetup pointer
| @required_vdisk | ||
| def set_vdisk_as_template(vdisk_name, vpool_name, api, timeout=SET_VDISK_AS_TEMPLATE_TIMEOUT): | ||
| def set_vdisk_as_template(vdisk_name, vpool_name, timeout=SET_VDISK_AS_TEMPLATE_TIMEOUT): |
There was a problem hiding this comment.
Missing cls declaration. Snapshot_name is currently treated as the VDiskSetup pointer
| @required_vdisk | ||
| def set_config_params(vdisk_name, vpool_name, config, api, timeout=SET_CONFIG_VDISK_TIMEOUT): | ||
| def set_config_params(vdisk_name, vpool_name, config, timeout=SET_CONFIG_VDISK_TIMEOUT): |
There was a problem hiding this comment.
Missing cls declaration. Snapshot_name is currently treated as the VDiskSetup pointer
| @@ -31,19 +33,20 @@ def check_required_roles(roles, storagerouter_ip=None, location="GLOBAL"): | |||
|
|
|||
| :param roles: the required roles | |||
| :type roles: list | |||
| :param storagerouter_ip: ip address of a storagerouter | |||
| :param storagerouter_ip: guid of a storagerouter | |||
| # fetch availabe roles | ||
| if location == "LOCAL": | ||
| # LOCAL | ||
| available_roles = DiskHelper.get_roles_from_disks(storagerouter_ip=storagerouter_ip) | ||
| storagerouter_guid = StoragerouterHelper.get_storagerouter_by_ip(storagerouter_ip).guid | ||
|
|
| @@ -13,32 +13,30 @@ | |||
| # | |||
| # Open vStorage is distributed in the hope that it will be useful, | |||
| # but WITHOUT ANY WARRANTY of any kind. | |||
| from ci.scenario_helpers.ci_constants import CIConstants | |||
There was a problem hiding this comment.
We might have glossed over something completely here.
The idea was that the automation library would be completely independent from anything (currently not the case as lookups are still happening by using the DAL instead of the API, #57 would remove this dependency)
Now with these imports, the integration tests have to be installed together with the automation_lib in order for it to work. We do not want this.
Instead I propose the following:
- Move the CIConstants api part to the automation lib (let it read from the same file)
- Strip the integration test stuff from CIConstants in automation lib
- Create a new CIConstants inside the integration tests which inherit the code from api_lib
- Apply the required stuff for integration tests in the new class
-api usage changes
-bugfixes