openstack
/
fuel-main
Code Issues Proposed changes

Rename ISO to ISO_PATH

This commit is contained in:
Victor Galkin 2013-06-17 13:16:05 +04:00 committed by default
parent ada1c477ef
commit 9d50231f5d
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuelweb_test/integration/ci_base.py
View File

@ -3,7 +3,7 @@ from devops.helpers.helpers import _get_file_size
from devops.manager import Manager
from ipaddr import IPNetwork
from fuelweb_test.node_roles import Nodes
from fuelweb_test.settings import EMPTY_SNAPSHOT, ISO
from fuelweb_test.settings import EMPTY_SNAPSHOT, ISO_PATH
class CiBase(object):
@ -86,7 +86,7 @@ class CiBase(object):
self.create_interfaces(networks, node)
self.add_empty_volume(node, name + '-system')
self.add_empty_volume(
node, name + '-iso', capacity=_get_file_size(ISO),
node, name + '-iso', capacity=_get_file_size(ISO_PATH),
format='raw', device='cdrom', bus='ide')
return node

4
fuelweb_test/integration/ci_fuel_web.py
View File

@ -5,7 +5,7 @@ from devops.helpers.helpers import wait
from ipaddr import IPNetwork
from fuelweb_test.integration.ci_base import CiBase
from fuelweb_test.node_roles import NodeRoles
from fuelweb_test.settings import INTERFACE_ORDER, POOLS, EMPTY_SNAPSHOT, ISO,\
from fuelweb_test.settings import INTERFACE_ORDER, POOLS, EMPTY_SNAPSHOT, ISO_PATH,\
FORWARDING, DHCP
logger = logging.getLogger('integration')
@ -81,7 +81,7 @@ class CiFuelWeb(CiBase):
def setup_environment(self):
admin = self.nodes().admin
admin.disk_devices.get(device='cdrom').volume.upload(ISO)
admin.disk_devices.get(device='cdrom').volume.upload(ISO_PATH)
self.environment().start(self.nodes().admins)
time.sleep(20)
admin.send_keys(self.get_keys(admin))

2
fuelweb_test/module.mk
View File

@ -2,7 +2,7 @@ test: test-integration
.PHONY: test-integration
test-integration: $(BUILD_DIR)/iso/iso.done
ENV_NAME=$(ENV_NAME) ISO=$(abspath $(ISO_PATH)) LOGS_DIR=$(LOGS_DIR) nosetests -l $(LEVEL) $(NOSEARGS) -w $(SOURCE_DIR)/fuelweb_test/integration --with-xunit -s
ENV_NAME=$(ENV_NAME) ISO_PATH=$(abspath $(ISO_PATH)) LOGS_DIR=$(LOGS_DIR) nosetests -l $(LEVEL) $(NOSEARGS) -w $(SOURCE_DIR)/fuelweb_test/integration --with-xunit -s
.PHONY: clean-integration-test
clean-integration-test: /:=$/

2
fuelweb_test/settings.py
View File

@ -1,6 +1,6 @@
import os
ISO = os.environ.get('ISO')
ISO_PATH = os.environ.get('ISO_PATH')
EMPTY_SNAPSHOT = os.environ.get('EMPTY_SNAPSHOT', 'empty')
INTERFACE_ORDER = ('internal', 'public', 'private')