From 2d93d83b44927e0ede7c0a5440bf5f472cc8d11a Mon Sep 17 00:00:00 2001 From: Girish Shilamkar Date: Fri, 14 Feb 2014 14:59:35 +0530 Subject: [PATCH] CLOUDSTACK-5674: Added missing import for FAILED --- test/integration/smoke/test_affinity_groups.py | 1 + test/integration/smoke/test_deploy_vm.py | 1 + .../smoke/test_deploy_vms_with_varied_deploymentplanners.py | 1 + test/integration/smoke/test_internal_lb.py | 1 + test/integration/smoke/test_loadbalance.py | 1 + test/integration/smoke/test_multipleips_per_nic.py | 1 + test/integration/smoke/test_network.py | 1 + test/integration/smoke/test_network_acl.py | 1 + test/integration/smoke/test_nic.py | 1 + test/integration/smoke/test_reset_vm_on_reboot.py | 1 + test/integration/smoke/test_routers.py | 1 + test/integration/smoke/test_scale_vm.py | 1 + test/integration/smoke/test_service_offerings.py | 1 + test/integration/smoke/test_snapshots.py | 1 + test/integration/smoke/test_templates.py | 1 + test/integration/smoke/test_vm_life_cycle.py | 1 + test/integration/smoke/test_vm_snapshots.py | 1 + test/integration/smoke/test_vpc_vpn.py | 1 + 18 files changed, 18 insertions(+) diff --git a/test/integration/smoke/test_affinity_groups.py b/test/integration/smoke/test_affinity_groups.py index 2d1e6c625c6..1700611a8f8 100644 --- a/test/integration/smoke/test_affinity_groups.py +++ b/test/integration/smoke/test_affinity_groups.py @@ -16,6 +16,7 @@ # specific language governing permissions and limitations # under the License. +from marvin.codes import FAILED from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * from marvin.lib.utils import * diff --git a/test/integration/smoke/test_deploy_vm.py b/test/integration/smoke/test_deploy_vm.py index 7b0647b1400..75c564f0649 100644 --- a/test/integration/smoke/test_deploy_vm.py +++ b/test/integration/smoke/test_deploy_vm.py @@ -22,6 +22,7 @@ from marvin.cloudstackTestCase import cloudstackTestCase #Import Integration Libraries +from marvin.codes import FAILED #base - contains all resources as entities and defines create, delete, list operations on them from marvin.lib.base import Account, VirtualMachine, ServiceOffering diff --git a/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py b/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py index afc9802b661..fb2883cde39 100644 --- a/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py +++ b/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py @@ -15,6 +15,7 @@ # specific language governing permissions and limitations # under the License. +from marvin.codes import FAILED from marvin.cloudstackTestCase import cloudstackTestCase from marvin.lib.base import Account, VirtualMachine, ServiceOffering, Host, Cluster from marvin.lib.common import get_zone, get_domain, get_template diff --git a/test/integration/smoke/test_internal_lb.py b/test/integration/smoke/test_internal_lb.py index b25c404787b..20deef0ec26 100644 --- a/test/integration/smoke/test_internal_lb.py +++ b/test/integration/smoke/test_internal_lb.py @@ -17,6 +17,7 @@ """ Tests for configuring Internal Load Balancing Rules. """ #Import Local Modules +from marvin.codes import FAILED from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * from marvin.lib.utils import * diff --git a/test/integration/smoke/test_loadbalance.py b/test/integration/smoke/test_loadbalance.py index 37a11f6ae71..600d9fbb049 100644 --- a/test/integration/smoke/test_loadbalance.py +++ b/test/integration/smoke/test_loadbalance.py @@ -15,6 +15,7 @@ # specific language governing permissions and limitations # under the License. +from marvin.codes import FAILED from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * from marvin.sshClient import SshClient diff --git a/test/integration/smoke/test_multipleips_per_nic.py b/test/integration/smoke/test_multipleips_per_nic.py index 4d0fbf432de..d9be4fa8e4f 100644 --- a/test/integration/smoke/test_multipleips_per_nic.py +++ b/test/integration/smoke/test_multipleips_per_nic.py @@ -16,6 +16,7 @@ # under the License. #Test from the Marvin - Testing in Python wiki +from marvin.codes import FAILED #All tests inherit from cloudstackTestCase from marvin.cloudstackTestCase import cloudstackTestCase diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py index 1e9ff801c09..37f132e4d93 100644 --- a/test/integration/smoke/test_network.py +++ b/test/integration/smoke/test_network.py @@ -18,6 +18,7 @@ """ #Import Local Modules import marvin +from marvin.codes import FAILED from marvin.cloudstackException import CloudstackAPIException from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * diff --git a/test/integration/smoke/test_network_acl.py b/test/integration/smoke/test_network_acl.py index f42ef46fea9..7765e8bd2de 100644 --- a/test/integration/smoke/test_network_acl.py +++ b/test/integration/smoke/test_network_acl.py @@ -17,6 +17,7 @@ """ Tests for Network ACLs in VPC """ #Import Local Modules +from marvin.codes import FAILED from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * from marvin.lib.utils import * diff --git a/test/integration/smoke/test_nic.py b/test/integration/smoke/test_nic.py index 0e866b8b7b3..afff95da5a9 100644 --- a/test/integration/smoke/test_nic.py +++ b/test/integration/smoke/test_nic.py @@ -16,6 +16,7 @@ # under the License. """ NIC tests for VM """ import marvin +from marvin.codes import FAILED from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * from marvin.sshClient import SshClient diff --git a/test/integration/smoke/test_reset_vm_on_reboot.py b/test/integration/smoke/test_reset_vm_on_reboot.py index 284df0c61f5..0b5c416d945 100644 --- a/test/integration/smoke/test_reset_vm_on_reboot.py +++ b/test/integration/smoke/test_reset_vm_on_reboot.py @@ -18,6 +18,7 @@ """ #Import Local Modules import marvin +from marvin.codes import FAILED from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * from marvin.lib.utils import * diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py index 0c91b9f1c29..4432e905733 100644 --- a/test/integration/smoke/test_routers.py +++ b/test/integration/smoke/test_routers.py @@ -18,6 +18,7 @@ """ #Import Local Modules import marvin +from marvin.codes import FAILED from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * from marvin.sshClient import SshClient diff --git a/test/integration/smoke/test_scale_vm.py b/test/integration/smoke/test_scale_vm.py index 2e038eca021..c0be3c59b58 100644 --- a/test/integration/smoke/test_scale_vm.py +++ b/test/integration/smoke/test_scale_vm.py @@ -18,6 +18,7 @@ """ #Import Local Modules import marvin +from marvin.codes import FAILED from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * from marvin.lib.utils import * diff --git a/test/integration/smoke/test_service_offerings.py b/test/integration/smoke/test_service_offerings.py index 809188c6d23..1681ed09a14 100644 --- a/test/integration/smoke/test_service_offerings.py +++ b/test/integration/smoke/test_service_offerings.py @@ -17,6 +17,7 @@ """ BVT tests for Service offerings""" #Import Local Modules +from marvin.codes import FAILED from marvin.cloudstackTestCase import cloudstackTestCase from marvin.cloudstackAPI import changeServiceForVirtualMachine,updateServiceOffering from marvin.lib.utils import (isAlmostEqual, diff --git a/test/integration/smoke/test_snapshots.py b/test/integration/smoke/test_snapshots.py index 50065012b71..58c51dd1da9 100644 --- a/test/integration/smoke/test_snapshots.py +++ b/test/integration/smoke/test_snapshots.py @@ -15,6 +15,7 @@ # specific language governing permissions and limitations # under the License. +from marvin.codes import FAILED from nose.plugins.attrib import attr from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * diff --git a/test/integration/smoke/test_templates.py b/test/integration/smoke/test_templates.py index a2ac662a861..8bda11dfa7a 100644 --- a/test/integration/smoke/test_templates.py +++ b/test/integration/smoke/test_templates.py @@ -18,6 +18,7 @@ """ #Import Local Modules import marvin +from marvin.codes import FAILED from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * from marvin.sshClient import SshClient diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py index db144b6b343..2ac83dc5bc3 100644 --- a/test/integration/smoke/test_vm_life_cycle.py +++ b/test/integration/smoke/test_vm_life_cycle.py @@ -18,6 +18,7 @@ """ #Import Local Modules import marvin +from marvin.codes import FAILED from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * from marvin.lib.utils import * diff --git a/test/integration/smoke/test_vm_snapshots.py b/test/integration/smoke/test_vm_snapshots.py index f3625ee365a..fd2a56e6bb3 100644 --- a/test/integration/smoke/test_vm_snapshots.py +++ b/test/integration/smoke/test_vm_snapshots.py @@ -17,6 +17,7 @@ # Import Local Modules import marvin +from marvin.codes import FAILED from nose.plugins.attrib import attr from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * diff --git a/test/integration/smoke/test_vpc_vpn.py b/test/integration/smoke/test_vpc_vpn.py index 11531d12043..8aa1e4c05b0 100644 --- a/test/integration/smoke/test_vpc_vpn.py +++ b/test/integration/smoke/test_vpc_vpn.py @@ -17,6 +17,7 @@ """ Tests for VPN in VPC """ #Import Local Modules +from marvin.codes import FAILED from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * from marvin.lib.utils import *