x
/
fuel-plugin-nsx-t
Code Issues Proposed changes

Fixes for tests 

Change-Id: I9bb7bd43b0ee73e35a45aece0e3ab68f09254998
This commit is contained in:
ibumarskov 2016-11-02 11:46:01 +03:00 committed by ekhomyakova
parent 60023f81d0
commit 76b7a75d36
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugin_test/helpers/settings.py
View File

@ -45,8 +45,8 @@ NSXT_USER = os.environ.get('NSXT_USER')
assigned_networks = { assigned_networks = {
iface_alias('eth0'): ['fuelweb_admin', 'private'], iface_alias('eth0'): ['fuelweb_admin', 'private'],
iface_alias('eth1'): ['public'], iface_alias('eth1'): ['public'],
iface_alias('eth2'): ['storage'], iface_alias('eth2'): ['management'],
iface_alias('eth4'): ['management'] iface_alias('eth4'): ['storage']
} }
cluster_settings = { cluster_settings = {

6
plugin_test/tests/test_plugin_nsxt.py
View File

@ -95,7 +95,7 @@ class TestNSXtSmoke(TestNSXtBase):
groups=["nsxt_smoke"]) groups=["nsxt_smoke"])
@log_snapshot_after_test @log_snapshot_after_test
def nsxt_smoke(self): def nsxt_smoke(self):
"""Deploy a cluster with NSXt Plugin. """Deploy cluster with NSXt Plugin and compute node.
Scenario: Scenario:
1. Upload the plugin to master node. 1. Upload the plugin to master node.
@ -147,7 +147,7 @@ class TestNSXtBVT(TestNSXtBase):
groups=["nsxt_bvt"]) groups=["nsxt_bvt"])
@log_snapshot_after_test @log_snapshot_after_test
def nsxt_bvt(self): def nsxt_bvt(self):
"""Deploy cluster with plugin and vmware datastore backend. """Deploy ha cluster with plugin and KVM + vCenter.
Scenario: Scenario:
1. Upload plugins to the master node. 1. Upload plugins to the master node.
@ -157,7 +157,7 @@ class TestNSXtBVT(TestNSXtBase):
* controller * controller
* controller * controller
* compute-vmware + cinder-vmware * compute-vmware + cinder-vmware
* compute * compute + cinder
4. Configure vcenter. 4. Configure vcenter.
5. Configure NSXt for that cluster. 5. Configure NSXt for that cluster.
6. Deploy cluster. 6. Deploy cluster.

2
plugin_test/tests/test_plugin_scale.py
View File

@ -298,7 +298,7 @@ class TestNSXtScale(TestNSXtBase):
self.reconfigure_cluster_interfaces(cluster_id) self.reconfigure_cluster_interfaces(cluster_id)
self.show_step(5) # Enable plugin and configure network settings self.show_step(5) # Enable plugin and configure network settings
self.enable_plugin(self.fuel_web, cluster_id) self.enable_plugin(cluster_id)
# Configure VMware settings. 1 cluster, 1 Nova Compute: compute-vmware # Configure VMware settings. 1 cluster, 1 Nova Compute: compute-vmware
self.show_step(6) self.show_step(6)

4
plugin_test/tests/test_plugin_system.py
View File

@ -163,8 +163,8 @@ class TestNSXtSystem(TestNSXtBase):
default_net = os_conn.nova.networks.find( default_net = os_conn.nova.networks.find(
label=self.default.PRIVATE_NET) label=self.default.PRIVATE_NET)
vm1_fip = os_conn.assign_floating_ip(vm1) vm1_fip = os_conn.assign_floating_ip(vm1).ip
vm2_fip = os_conn.assign_floating_ip(vm2) vm2_fip = os_conn.assign_floating_ip(vm2).ip
vm1_ip = os_conn.get_nova_instance_ip(vm1, net_name=default_net) vm1_ip = os_conn.get_nova_instance_ip(vm1, net_name=default_net)
vm2_ip = os_conn.get_nova_instance_ip(vm2, net_name=default_net) vm2_ip = os_conn.get_nova_instance_ip(vm2, net_name=default_net)