openstack
/
fuel-library
Code Issues Proposed changes

Change iface order

This commit is contained in:
vic 2012-12-06 16:36:27 +04:00
parent 327eeaaf63
commit dd83838b62
17 changed files with 69 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuel_test/base_test_case.py
View File

@ -29,7 +29,7 @@ class BaseTestCase(unittest.TestCase):
def revert_snapshots(self):
safety_revert_nodes(self.environment.nodes, EMPTY_SNAPSHOT)
for node in self.environment.nodes:
remote = ssh(node.ip_address, username='root', password='r00tme')
remote = ssh(node.ip_address_by_network['internal'], username='root', password='r00tme')
sync_time(remote.sudo.ssh)
execute(remote.sudo.ssh, 'yum makecache')
@ -70,7 +70,7 @@ class BaseTestCase(unittest.TestCase):
def do(self, nodes, command):
results = []
for node in nodes:
remote = ssh(node.ip_address, username='root', password='r00tme')
remote = ssh(node.ip_address_by_network['internal'], username='root', password='r00tme')
results.append(execute(remote.sudo.ssh, command))
return results

14
fuel_test/ci/ci_base.py
View File

@ -85,7 +85,7 @@ class CiBase(object):
def add_nodes_to_hosts(self, remote, nodes):
for node in nodes:
add_to_hosts(remote, node.ip_address, node.name,
add_to_hosts(remote, node.ip_address_by_network['internal'], node.name,
node.name + '.mirantis.com')
def setup_master_node(self, master_remote, nodes):
@ -100,7 +100,7 @@ class CiBase(object):
for node in nodes:
if node.name != 'master':
remote = ssh(
node.ip_address, username='root',
node.ip_address_by_network['internal'], username='root',
password='r00tme')
self.add_nodes_to_hosts(remote, nodes)
setup_puppet_client(remote)
@ -121,7 +121,7 @@ class CiBase(object):
def rename_nodes(self, nodes):
for node in nodes:
remote = ssh(node.ip_address, username='root', password='r00tme')
remote = ssh(node.ip_address_by_network['internal'], username='root', password='r00tme')
change_host_name(remote, node.name, node.name + '.mirantis.com')
logging.info("Renamed %s" % node.name)
@ -133,11 +133,11 @@ class CiBase(object):
for node in environment.nodes:
node.start()
for node in environment.nodes:
logging.info("Waiting ssh... %s" % node.ip_address)
wait(lambda: tcp_ping(node.ip_address, 22), timeout=1800)
logging.info("Waiting ssh... %s" % node.ip_address_by_network['internal'])
wait(lambda: tcp_ping(node.ip_address_by_network['internal'], 22), timeout=1800)
self.rename_nodes(environment.nodes)
master_node = environment.node['master']
master_remote = ssh(master_node.ip_address, username='root',
master_remote = ssh(master_node.ip_address_by_network['internal'], username='root',
password='r00tme')
self.setup_master_node(master_remote, environment.nodes)
self.setup_agent_nodes(environment.nodes)
@ -147,7 +147,7 @@ class CiBase(object):
for node in environment.nodes:
logging.info("Creating snapshot %s" % EMPTY_SNAPSHOT)
node.save_snapshot(EMPTY_SNAPSHOT)
logging.info("Test node is ready at %s" % node.ip_address)
logging.info("Test node is ready at %s" % node.ip_address_by_network['internal'])
def destroy_environment(self):
if self.environment:

8
fuel_test/ci/ci_cobbler.py
View File

@ -61,7 +61,7 @@ class CiCobbler(CiBase):
for node in start_nodes:
node.start()
for node in start_nodes:
logging.info("Waiting ssh... %s" % node.ip_address)
logging.info("Waiting ssh... %s" % node.ip_address_by_network['internal'])
wait(lambda: tcp_ping(node.ip_address_by_network['public'], 22),
timeout=1800)
gateway = self.environment.network['internal'].ip_addresses[1]
@ -69,10 +69,10 @@ class CiCobbler(CiBase):
for node in start_nodes:
remote = ssh(node.ip_address_by_network['public'], username='root',
password='r00tme')
execute(remote, 'ifdown eth0')
execute(remote, 'ifdown eth1')
write_static_ip(remote, node.ip_address_by_network['internal'],
net_mask, gateway)
execute(remote, 'ifup eth0')
execute(remote, 'ifup eth1')
master_remote = ssh(
master_node.ip_address_by_network['public'], username='root',
password='r00tme')
@ -85,4 +85,4 @@ class CiCobbler(CiBase):
for node in self.environment.nodes:
logging.info("Creating snapshot %s" % EMPTY_SNAPSHOT)
node.save_snapshot(EMPTY_SNAPSHOT)
logging.info("Test node is ready at %s" % node.ip_address)
logging.info("Test node is ready at %s" % node.ip_address_by_network['internal'])

27
fuel_test/cobbler/test_cobbler.py
View File

@ -4,7 +4,7 @@ from devops.helpers import ssh
from fuel_test.cobbler.cobbler_client import CobblerClient
from fuel_test.cobbler.cobbler_test_case import CobblerTestCase
from fuel_test.helpers import tcp_ping, udp_ping, safety_revert_nodes, add_to_hosts, sign_all_node_certificates, sync_time, upload_recipes, upload_keys, await_node_deploy, build_astute, install_astute, write_config, execute
from fuel_test.settings import EMPTY_SNAPSHOT, OS_FAMILY, PUPPET_VERSION
from fuel_test.settings import EMPTY_SNAPSHOT, OS_FAMILY, PUPPET_VERSION, PUBLIC_INTERFACE, INTERNAL_INTERFACE, PRIVATE_INTERFACE
from fuel_test.root import root
class CobblerCase(CobblerTestCase):
@ -20,7 +20,7 @@ class CobblerCase(CobblerTestCase):
safety_revert_nodes(self.environment.nodes, EMPTY_SNAPSHOT)
self.configure_master_remote()
for node in [self.environment.node['master']] + self.nodes.cobblers:
remote = ssh(node.ip_address, username='root', password='r00tme')
remote = ssh(node.ip_address_by_network['internal'], username='root', password='r00tme')
sync_time(remote.sudo.ssh)
remote.sudo.ssh.execute('yum makecache')
self.write_cobbler_manifest()
@ -39,7 +39,7 @@ class CobblerCase(CobblerTestCase):
def deploy_stomp_node(self):
self.configure_master_remote()
for node in [self.environment.node['master']] + self.nodes.cobblers:
remote = ssh(node.ip_address, username='root', password='r00tme')
remote = ssh(node.ip_address_by_network['internal'], username='root', password='r00tme')
sync_time(remote.sudo.ssh)
remote.sudo.ssh.execute('yum makecache')
self.write_stomp_manifest()
@ -104,11 +104,11 @@ class CobblerCase(CobblerTestCase):
netboot_enabled="1")
client.modify_system(system_id, 'modify_interface', {
"macaddress-eth0": str(node_mac0),
"ipaddress-eth0": str(node_ip),
"dnsname-eth0": node_name + ".mirantis.com",
"static-eth0": "1",
"static-eth0": "0",
"macaddress-eth1": str(node_mac1),
"static-eth1": "0",
"ipaddress-eth1": str(node_ip),
"dnsname-eth1": node_name + ".mirantis.com",
"static-eth1": "1",
"macaddress-eth2": str(node_mac2),
"static-eth2": "0"
}, token)
@ -190,10 +190,9 @@ class CobblerCase(CobblerTestCase):
controller_hostnames=[
"%s" % controller1.name,
"%s" % controller2.name],
public_interface="'eth2'",
internal_interface="'eth0'",
internal_address="$ipaddress_eth0",
private_interface="'eth1'",
public_interface="'%s'" % PUBLIC_INTERFACE,
internal_interface="'%s'" % INTERNAL_INTERFACE,
private_interface="'%s'" % PRIVATE_INTERFACE,
nv_physical_volume= ["/dev/vdb"]
)
config_text = \
@ -219,9 +218,9 @@ class CobblerCase(CobblerTestCase):
'site_simple.pp'),
floating_network_range="'%s'" % self.ci().get_floating_network(),
fixed_network_range="'%s'" % self.ci().get_fixed_network(),
public_interface="'eth2'",
internal_interface="'eth0'",
private_interface="'eth1'",
public_interface="'%s'" % PUBLIC_INTERFACE,
internal_interface="'%s'" % INTERNAL_INTERFACE,
private_interface="'%s'" % PRIVATE_INTERFACE,
mirror_type="'internal'",
controller_node_address="'%s'" % controller.ip_address_by_network[
'internal'],

2
fuel_test/config/interfaces.config
View File

@ -8,8 +8,8 @@ iface lo inet loopback
# The primary network interface
auto eth0 eth1 eth2
iface eth0 inet static
iface eth1 inet manual
address %(ip)s
netmask %(net_mask)s
gateway %(gateway)s
iface eth1 inet manual
iface eth2 inet dhcp

4
fuel_test/helpers.py
View File

@ -416,12 +416,12 @@ def make_shared_storage(remote, host, client_nodes, access_network):
sleep(15)
for controller in client_nodes:
remote_controller = ssh(
controller.ip_address, username='root',
controller.ip_address_by_network['internal'], username='root',
password='r00tme').sudo.ssh
tempest_mount_glance_images(remote_controller, host)
sleep(60)
def write_static_ip(remote, ip, net_mask, gateway, interface='eth0'):
def write_static_ip(remote, ip, net_mask, gateway, interface='eth1'):
if OS_FAMILY == 'centos':
path = '/etc/sysconfig/network-scripts/ifcfg-%s' % interface
text = load(root('fuel_test', 'config', 'ifcfg-eth0.config')) % {

8
fuel_test/openstack/openstack_test_case.py
View File

@ -2,6 +2,7 @@ import unittest
from fuel_test.base_test_case import BaseTestCase
from fuel_test.ci.ci_openstack import CiOpenStack
from fuel_test.root import root
from fuel_test.settings import PUBLIC_INTERFACE, INTERNAL_INTERFACE, PRIVATE_INTERFACE
class OpenStackTestCase(BaseTestCase):
def ci(self):
@ -36,10 +37,9 @@ class OpenStackTestCase(BaseTestCase):
controller_hostnames=[
"%s" % controller1.name,
"%s" % controller2.name],
public_interface="'eth2'",
internal_interface="'eth0'",
internal_address="$ipaddress_eth0",
private_interface="'eth1'",
public_interface="'%s'" % PUBLIC_INTERFACE,
internal_interface="'%s'" % INTERNAL_INTERFACE,
private_interface="'%s'" % PRIVATE_INTERFACE,
nv_physical_volume= ["/dev/vdb"]
)

4
fuel_test/openstack/prepare_for_tempest.py
View File

@ -16,7 +16,7 @@ class PrepareOpenStackForTempest(OpenStackTestCase):
def prepare_for_tempest(self):
auth_host = self.ci().get_public_virtual_ip()
remote = ssh(
self.ci().nodes().controllers[0].ip_address, username='root',
self.ci().nodes().controllers[0].ip_address_by_network['internal'], username='root',
password='r00tme').sudo.ssh
make_shared_storage(
remote,
@ -35,7 +35,7 @@ class PrepareOpenStackForTempest(OpenStackTestCase):
def prepare_for_tempest_folsom(self):
auth_host = self.ci().get_public_virtual_ip()
remote = ssh(
self.ci().nodes().controllers[0].ip_address, username='root',
self.ci().nodes().controllers[0].ip_address_by_network['internal'], username='root',
password='r00tme').sudo.ssh
make_shared_storage(
remote,

18
fuel_test/openstack/test_apply_noop.py
View File

@ -8,6 +8,7 @@ import unittest
#todo raise exception if remote command writes to stderr or returns non-zero exit code
#todo pretty output
#todo async command execution
from fuel_test.settings import PUBLIC_INTERFACE, INTERNAL_INTERFACE, PRIVATE_INTERFACE
class MyTestCase(OpenStackTestCase):
@ -40,12 +41,11 @@ class MyTestCase(OpenStackTestCase):
controller_hostnames=[
"%s" % self.nodes.controllers[0].name,
"%s" % self.nodes.controllers[1].name],
public_interface="'eth2'",
internal_interface="'eth0'",
internal_address="$ipaddress_eth0",
private_interface="'eth1'"
public_interface="'%s'" % PUBLIC_INTERFACE,
internal_interface="'%s'" % INTERNAL_INTERFACE,
private_interface="'%s'" % PRIVATE_INTERFACE
)
remote = ssh(self.nodes.controllers[0].ip_address, username='root',
remote = ssh(self.nodes.controllers[0].ip_address_by_network['internal'], username='root',
password='r00tme')
result = execute(remote.sudo.ssh, 'puppet agent --test')
self.assertResult(result)
@ -65,11 +65,11 @@ class MyTestCase(OpenStackTestCase):
'internal']
],
)
remote = ssh(self.nodes.controllers[0].ip_address, username='root',
remote = ssh(self.nodes.controllers[0].ip_address_by_network['internal'], username='root',
password='r00tme')
result = remote.sudo.ssh.execute('puppet agent --test')
self.assertResult(result)
remote = ssh(self.nodes.controllers[1].ip_address, username='root',
remote = ssh(self.nodes.controllers[1].ip_address_by_network['internal'], username='root',
password='r00tme')
result = execute(remote.sudo.ssh, 'puppet agent --test')
self.assertResult(result)
@ -88,10 +88,10 @@ class MyTestCase(OpenStackTestCase):
'internal']
],
)
remote = ssh(self.nodes.controllers[0].ip_address, username='root',
remote = ssh(self.nodes.controllers[0].ip_address_by_network['internal'], username='root',
password='r00tme')
result1 = execute(remote.sudo.ssh, 'puppet agent --test')
remote2 = ssh(self.nodes.controllers[1].ip_address, username='root',
remote2 = ssh(self.nodes.controllers[1].ip_address_by_network['internal'], username='root',
password='r00tme')
result2 = execute(remote2.sudo.ssh, 'puppet agent --test')
self.assertResult(result1)

7
fuel_test/openstack_simple/openstack_simple_test_case.py
View File

@ -2,6 +2,7 @@ import unittest
from fuel_test.base_test_case import BaseTestCase
from fuel_test.ci.ci_openstack_simple import CiOpenStackSimple
from fuel_test.root import root
from fuel_test.settings import PUBLIC_INTERFACE, INTERNAL_INTERFACE, PRIVATE_INTERFACE
class OpenStackSimpleTestCase(BaseTestCase):
def ci(self):
@ -19,9 +20,9 @@ class OpenStackSimpleTestCase(BaseTestCase):
'site_simple.pp'),
floating_network_range="'%s'" % self.ci().get_floating_network(),
fixed_network_range="'%s'" % self.ci().get_fixed_network(),
public_interface="'eth2'",
internal_interface="'eth0'",
private_interface="'eth1'",
public_interface="'%s'" % PUBLIC_INTERFACE,
internal_interface="'%s'" % INTERNAL_INTERFACE,
private_interface="'%s'" % PRIVATE_INTERFACE,
mirror_type="'internal'",
controller_node_address="'%s'" % controller.ip_address_by_network[
'internal'],

8
fuel_test/openstack_swift/openstack_swift_test_case.py
View File

@ -1,6 +1,7 @@
from fuel_test.base_test_case import BaseTestCase
from fuel_test.ci.ci_openstack_swift import CiOpenStackSwift
from fuel_test.root import root
from fuel_test.settings import PUBLIC_INTERFACE, INTERNAL_INTERFACE, PRIVATE_INTERFACE
class OpenStackSwiftTestCase(BaseTestCase):
def ci(self):
@ -62,9 +63,8 @@ class OpenStackSwiftTestCase(BaseTestCase):
# node02.name,
# node02.ip_address_by_network['internal']),
controller_hostnames=["%s" % controller.name for controller in controllers],
public_interface="'eth2'",
internal_interface="'eth0'",
internal_address="$ipaddress_eth0",
private_interface="'eth1'",
public_interface="'%s'" % PUBLIC_INTERFACE,
internal_interface="'%s'" % INTERNAL_INTERFACE,
private_interface="'%s'" % PRIVATE_INTERFACE,
nv_physical_volume= ["/dev/vdb"]
)

4
fuel_test/openstack_swift/test_openstack_swift.py
View File

@ -12,10 +12,10 @@ class OpenStackSwiftCase(OpenStackSwiftTestCase):
'puppet agent --test')
results = []
for node in self.nodes.storages:
remote = ssh(node.ip_address, username='root', password='r00tme')
remote = ssh(node.ip_address_by_network['internal'], username='root', password='r00tme')
results.append(execute(remote.sudo.ssh, 'puppet agent --test'))
results.append(execute(remote.sudo.ssh, 'puppet agent --test'))
remote = ssh(self.nodes.proxies[0].ip_address, username='root',
remote = ssh(self.nodes.proxies[0].ip_address_by_network['internal'], username='root',
password='r00tme')
results.append(execute(remote.sudo.ssh, 'puppet agent --test'))
self.validate(self.nodes.storages,

8
fuel_test/openstack_swift_compact/openstack_swift_compact_test_case.py
View File

@ -1,6 +1,7 @@
from fuel_test.base_test_case import BaseTestCase
from fuel_test.ci.ci_openstack_swift_compact import CiOpenStackSwiftCompact
from fuel_test.root import root
from fuel_test.settings import PUBLIC_INTERFACE, INTERNAL_INTERFACE, PRIVATE_INTERFACE
class OpenStackSwiftCompactTestCase(BaseTestCase):
def ci(self):
@ -40,10 +41,9 @@ class OpenStackSwiftCompactTestCase(BaseTestCase):
controller_internal_addresses = controller_internal_addresses,
controller_hostnames=["%s" % controller.name for controller in controllers],
swift_proxy_address="'%s'" % self.ci().get_internal_virtual_ip(),
public_interface="'eth2'",
internal_interface="'eth0'",
internal_address="$ipaddress_eth0",
private_interface="'eth1'",
public_interface="'%s'" % PUBLIC_INTERFACE,
internal_interface="'%s'" % INTERNAL_INTERFACE,
private_interface="'%s'" % PRIVATE_INTERFACE,
mirror_type ="'internal'",
nv_physical_volume= ["/dev/vdb"]
)

2
fuel_test/openstack_swift_compact/prepare_for_tempest.py
View File

@ -16,7 +16,7 @@ class PrepareOpenStackSwiftCompactForTempest(OpenStackSwiftCompactTestCase):
def prepare_for_tempest_if_swift(self):
auth_host = self.ci().get_public_virtual_ip()
remote = ssh(
self.ci().nodes().controllers[0].ip_address, username='root',
self.ci().nodes().controllers[0].ip_address_by_network['internal'], username='root',
password='r00tme').sudo.ssh
image_ref, image_ref_alt = make_tempest_objects(
auth_host,

6
fuel_test/openstack_swift_compact/test_openstack_swift_compact.py
View File

@ -12,12 +12,12 @@ class OpenStackSwiftCompactCase(OpenStackSwiftCompactTestCase):
# 'puppet agent --test')
results = []
for node in self.nodes.controllers:
remote = ssh(node.ip_address, username='root', password='r00tme')
remote = ssh(node.ip_address_by_network['internal'], username='root', password='r00tme')
results.append(execute(remote.sudo.ssh, 'puppet agent --test'))
for node in self.nodes.controllers:
remote = ssh(node.ip_address, username='root', password='r00tme')
remote = ssh(node.ip_address_by_network['internal'], username='root', password='r00tme')
results.append(execute(remote.sudo.ssh, 'puppet agent --test'))
remote = ssh(self.nodes.controllers[0].ip_address,username='root', password='r00tme')
remote = ssh(self.nodes.controllers[0].ip_address_by_network['internal'],username='root', password='r00tme')
results.append(execute(remote.sudo.ssh, 'puppet agent --test'))
self.validate(
self.nodes.controllers,

3
fuel_test/settings.py
View File

@ -64,3 +64,6 @@ COBBLER_COMPUTES = int(os.environ.get('COBBLER_COMPUTES', 2))
EMPTY_SNAPSHOT = os.environ.get('EMPTY_SNAPSHOT', 'empty')
OPENSTACK_SNAPSHOT = os.environ.get('OPENSTACK_SNAPSHOT', 'openstack')
PUBLIC_INTERFACE='eth0'
INTERNAL_INTERFACE = 'eth1'
PRIVATE_INTERFACE = 'eth2'

8
fuel_test/swift/test_swift.py
View File

@ -24,18 +24,18 @@ class SwiftCase(BaseTestCase):
)
results = []
#install keystone
remote = ssh(self.nodes.keystones[0].ip_address, username='root',
remote = ssh(self.nodes.keystones[0].ip_address_by_network['internal'], username='root',
password='r00tme')
results.append(execute(remote.sudo.ssh, 'puppet agent --test'))
for node in self.nodes.storages:
remote = ssh(node.ip_address, username='root', password='r00tme')
remote = ssh(node.ip_address_by_network['internal'], username='root', password='r00tme')
results.append(execute(remote.sudo.ssh, 'puppet agent --test'))
results.append(execute(remote.sudo.ssh, 'puppet agent --test'))
remote = ssh(self.nodes.proxies[0].ip_address, username='root',
remote = ssh(self.nodes.proxies[0].ip_address_by_network['internal'], username='root',
password='r00tme')
results.append(execute(remote.sudo.ssh, 'puppet agent --test'))
for node in self.nodes.storages:
remote = ssh(node.ip_address, username='root', password='r00tme')
remote = ssh(node.ip_address_by_network['internal'], username='root', password='r00tme')
results.append(execute(remote.sudo.ssh, 'puppet agent --test'))
# for result in results: