Mohammed Morsi
2008-Aug-27 20:08 UTC
[Ovirt-devel] [PATCH] small fix to broken test cases cause be recent commit
--- wui/src/test/fixtures/hosts.yml | 17 +++++++++-------- wui/src/test/fixtures/nics.yml | 14 ++++++++------ wui/src/test/fixtures/pools.yml | 10 ++++++---- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/wui/src/test/fixtures/hosts.yml b/wui/src/test/fixtures/hosts.yml index bf6803c..44397da 100644 --- a/wui/src/test/fixtures/hosts.yml +++ b/wui/src/test/fixtures/hosts.yml @@ -1,11 +1,3 @@ -mailservers_managed_node: - uuid: '182a8596-961d-11dc-9387-001558c41534' - hostname: 'mail.mynetwork.com' - arch: 'i386' - memory: 16384 - is_disabled: 0 - hypervisor_type: 'kvm' - hardware_pool_id: <%= Fixtures.identify(:prodops_pool) %> one: id: 1 @@ -98,3 +90,12 @@ ten: hypervisor_type: 'kvm' hardware_pool_id: 1 state: "available" +mailservers_managed_node: + id: 11 + uuid: '182a8596-961d-11dc-9387-001558c41534' + hostname: 'mail.mynetwork.com' + arch: 'i386' + memory: 16384 + is_disabled: 0 + hypervisor_type: 'kvm' + hardware_pool_id: <%= Fixtures.identify(:prodops_pool) %> diff --git a/wui/src/test/fixtures/nics.yml b/wui/src/test/fixtures/nics.yml index 1eeb5c2..8726fb6 100644 --- a/wui/src/test/fixtures/nics.yml +++ b/wui/src/test/fixtures/nics.yml @@ -1,9 +1,3 @@ -mailserver_nic_one: - mac: '00:11:22:33:44:55' - usage_type: '1' - bandwidth: 100 - host_id: <%= Fixtures.identify(:mailservers_managed_node) %> - one: id: 1 mac: '00:11:22:33:44:55' @@ -32,3 +26,11 @@ four: usage_type: '1' bandwidth: 10 host_id: 10 +mailserver_nic_one: + id: 5 + mac: '00:11:22:33:44:55' + usage_type: '1' + bandwidth: 100 + host_id: <%= Fixtures.identify(:mailservers_managed_node) %> + + diff --git a/wui/src/test/fixtures/pools.yml b/wui/src/test/fixtures/pools.yml index 91dd6e2..1862e40 100644 --- a/wui/src/test/fixtures/pools.yml +++ b/wui/src/test/fixtures/pools.yml @@ -1,7 +1,3 @@ -prodops_pool: - name: 'Production Operations' - type: 'HardwarePool' - one: id: 1 name: 'master pool' @@ -73,3 +69,9 @@ ten: parent_id: 5 lft: 14 rgt: 15 +prodops_pool: + id: 11 + name: 'Production Operations' + type: 'HardwarePool' + parent_id: 5 + -- 1.5.4.1
Mohammed Morsi
2008-Aug-27 20:41 UTC
[Ovirt-devel] [PATCH] small fix to broken test cases cause be recent commit
--- wui/src/test/fixtures/hosts.yml | 19 ++++++++++--------- wui/src/test/fixtures/nics.yml | 11 ++++++----- wui/src/test/fixtures/pools.yml | 10 ++++++---- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/wui/src/test/fixtures/hosts.yml b/wui/src/test/fixtures/hosts.yml index 64707da..f54516a 100644 --- a/wui/src/test/fixtures/hosts.yml +++ b/wui/src/test/fixtures/hosts.yml @@ -1,12 +1,3 @@ -mailservers_managed_node: - uuid: '182a8596-961d-11dc-9387-001558c41534' - hostname: 'mail.mynetwork.com' - arch: 'i386' - memory: 16384 - is_disabled: 0 - hypervisor_type: 'kvm' - hardware_pool_id: <%= Fixtures.identify(:prodops_pool) %> - one: id: 1 uuid: '1148fdf8-961d-11dc-9387-001558c41534' @@ -88,3 +79,13 @@ nine: is_disabled: 0 hypervisor_type: 'kvm' hardware_pool_id: 3 +mailservers_managed_node: + id: 10 + uuid: '182a8596-961d-11dc-9387-001558c41534' + hostname: 'mail.mynetwork.com' + arch: 'i386' + memory: 16384 + is_disabled: 0 + hypervisor_type: 'kvm' + hardware_pool_id: <%= Fixtures.identify(:prodops_pool) %> + diff --git a/wui/src/test/fixtures/nics.yml b/wui/src/test/fixtures/nics.yml index c37f3d4..c5d2d19 100644 --- a/wui/src/test/fixtures/nics.yml +++ b/wui/src/test/fixtures/nics.yml @@ -1,8 +1,3 @@ -mailserver_nic_one: - mac: '00:11:22:33:44:55' - usage_type: '1' - bandwidth: 100 - host_id: <%= Fixtures.identify(:mailservers_managed_node) %> one: id: 1 @@ -25,3 +20,9 @@ three: usage_type: '1' bandwidth: 10 host_id: 2 +mailserver_nic_one: + id: 4 + mac: '00:11:22:33:44:55' + usage_type: '1' + bandwidth: 100 + host_id: <%= Fixtures.identify(:mailservers_managed_node) %> diff --git a/wui/src/test/fixtures/pools.yml b/wui/src/test/fixtures/pools.yml index 91dd6e2..1862e40 100644 --- a/wui/src/test/fixtures/pools.yml +++ b/wui/src/test/fixtures/pools.yml @@ -1,7 +1,3 @@ -prodops_pool: - name: 'Production Operations' - type: 'HardwarePool' - one: id: 1 name: 'master pool' @@ -73,3 +69,9 @@ ten: parent_id: 5 lft: 14 rgt: 15 +prodops_pool: + id: 11 + name: 'Production Operations' + type: 'HardwarePool' + parent_id: 5 + -- 1.5.4.1