From a183818f9ce7a3e00ee5d7bec261330223efa59c Mon Sep 17 00:00:00 2001
From: Manali Latkar <manalil@thoughtworks.com>
Date: Fri, 4 Oct 2013 12:26:22 +0530
Subject: [PATCH] removing the integer validation of flavor due to the changes
 in flavor field by BRM

---
 tests/unit/test_nova_verifier.py | 19 +------------------
 verifier/nova_verifier.py        |  2 --
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/tests/unit/test_nova_verifier.py b/tests/unit/test_nova_verifier.py
index 63f2506..d1a84ff 100644
--- a/tests/unit/test_nova_verifier.py
+++ b/tests/unit/test_nova_verifier.py
@@ -386,23 +386,6 @@ class NovaVerifierTestCase(StacktachBaseTestCase):
             "{ tenant : tenant } of incorrect type for exist id 23")
         self.mox.VerifyAll()
 
-    def test_should_verify_flavor_is_of_type_integer(self):
-        exist = self.mox.CreateMockAnything()
-        exist.tenant = '3762854cd6f6435998188d5120e4c271'
-        exist.id = 23
-        exist.launched_at = decimal.Decimal('1.1')
-        exist.instance_type_id = 'flavor'
-        self.mox.ReplayAll()
-
-        with self.assertRaises(WrongTypeException) as wt:
-            nova_verifier._verify_validity(exist, 'all')
-        exception = wt.exception
-        self.assertEqual(exception.field_name, 'instance_type_id')
-        self.assertEqual(
-            exception.reason,
-            "{ instance_type_id : flavor } of incorrect type for exist id 23")
-        self.mox.VerifyAll()
-
     def test_should_verify_launched_at_is_of_type_decimal(self):
         exist = self.mox.CreateMockAnything()
         exist.tenant = '3762854cd6f6435998188d5120e4c271'
@@ -608,7 +591,7 @@ class NovaVerifierTestCase(StacktachBaseTestCase):
         exist.id = 23
         exist.launched_at = decimal.Decimal('1.1')
         exist.deleted_at = decimal.Decimal('5.1')
-        exist.instance_type_id = '4'
+        exist.instance_type_id = 'performance1-1'
         exist.rax_options = '12'
         exist.os_architecture = 'x64'
         exist.os_distro = 'com.microsoft.server'
diff --git a/verifier/nova_verifier.py b/verifier/nova_verifier.py
index f0e4d69..eaa373e 100644
--- a/verifier/nova_verifier.py
+++ b/verifier/nova_verifier.py
@@ -153,8 +153,6 @@ def _verify_basic_validity(exist):
         if field_value is None:
             raise NullFieldException(field_name, exist.id)
     base_verifier._is_hex_owner_id('tenant', exist.tenant, exist.id)
-    base_verifier._is_int_in_char('instance_type_id', exist.instance_type_id,
-                                  exist.id)
     base_verifier._is_like_date('launched_at', exist.launched_at, exist.id)
     if exist.deleted_at is not None:
         base_verifier._is_like_date('deleted_at', exist.deleted_at, exist.id)