From 45d28dfb035b4e219845d44e00073d70211e8175 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Tue, 22 Mar 2011 21:14:26 -0700
Subject: Fixed up unit tests and direct api that was also calling _serialize
 (naughty!)

---
 nova/tests/api/openstack/test_limits.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_limits.py b/nova/tests/api/openstack/test_limits.py
index 05cfacc60..df367005d 100644
--- a/nova/tests/api/openstack/test_limits.py
+++ b/nova/tests/api/openstack/test_limits.py
@@ -136,10 +136,17 @@ class LimitsControllerTest(BaseLimitTestSuite):
         request = self._get_index_request("application/xml")
         response = request.get_response(self.controller)
 
-        expected = "<limits><rate/><absolute/></limits>"
-        body = response.body.replace("\n", "").replace(" ", "")
+        expected = parseString("""
+            <limits
+                xmlns="http://docs.rackspacecloud.com/servers/api/v1.0">
+                <rate/>
+                <absolute/>
+            </limits>
+        """.replace("  ", ""))
 
-        self.assertEqual(expected, body)
+        body = parseString(response.body.replace("  ", ""))
+
+        self.assertEqual(expected.toxml(), body.toxml())
 
     def test_index_xml(self):
         """Test getting limit details in XML."""
@@ -148,7 +155,8 @@ class LimitsControllerTest(BaseLimitTestSuite):
         response = request.get_response(self.controller)
 
         expected = parseString("""
-            <limits>
+            <limits
+                xmlns="http://docs.rackspacecloud.com/servers/api/v1.0">
                 <rate>
                     <limit URI="*" regex=".*" remaining="10" resetTime="0"
                         unit="MINUTE" value="10" verb="GET"/>
-- 
cgit 


From 399056300a0be228ec4c56587ec0d9c0d09d927c Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Tue, 29 Mar 2011 16:54:37 -0700
Subject: Fix unit test to reflect fact that instance is no longer deleted,
 just marked SHUTOFF

---
 nova/tests/test_compute.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index d1ef68de4..b7f08dfbe 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -654,4 +654,5 @@ class ComputeTestCase(test.TestCase):
 
         instances = db.instance_get_all(context.get_admin_context())
         LOG.info(_("After force-killing instances: %s"), instances)
-        self.assertEqual(len(instances), 0)
+        self.assertEqual(len(instances), 1)
+        self.assertEqual(power_state.SHUTOFF, instances[0]['state'])
-- 
cgit 


From 12505c6bae61e72b6c75ac647323c3ec15997df1 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Wed, 30 Mar 2011 10:05:06 -0700
Subject: Add XML namespaces to the OpenStack API

---
 nova/tests/integrated/test_xml.py | 56 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 nova/tests/integrated/test_xml.py

(limited to 'nova/tests')

diff --git a/nova/tests/integrated/test_xml.py b/nova/tests/integrated/test_xml.py
new file mode 100644
index 000000000..8a9754777
--- /dev/null
+++ b/nova/tests/integrated/test_xml.py
@@ -0,0 +1,56 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 Justin Santa Barbara
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from nova import flags
+from nova.log import logging
+from nova.tests.integrated import integrated_helpers
+from nova.api.openstack import common
+
+
+LOG = logging.getLogger('nova.tests.integrated')
+
+
+FLAGS = flags.FLAGS
+FLAGS.verbose = True
+
+
+class XmlTests(integrated_helpers._IntegratedTestBase):
+    """"Some basic XML sanity checks."""
+
+    def test_namespace_limits(self):
+        """/limits should have v1.0 namespace (hasn't changed in 1.1)."""
+        headers = {}
+        headers['Accept'] = 'application/xml'
+
+        response = self.api.api_request('/limits', headers=headers)
+        data = response.read()
+        LOG.debug("data: %s" % data)
+
+        prefix = '<limits xmlns="%s"' % common.XML_NS_V10
+        self.assertTrue(data.startswith(prefix))
+
+    def test_namespace_servers(self):
+        """/servers should have v1.1 namespace (has changed in 1.1)."""
+        headers = {}
+        headers['Accept'] = 'application/xml'
+
+        response = self.api.api_request('/servers', headers=headers)
+        data = response.read()
+        LOG.debug("data: %s" % data)
+
+        prefix = '<servers xmlns="%s"' % common.XML_NS_V11
+        self.assertTrue(data.startswith(prefix))
-- 
cgit 


From 00fad85ac9cacf71f069ec6b9c9c7e974a9d9edd Mon Sep 17 00:00:00 2001
From: Dan Prince <dan.prince@rackspace.com>
Date: Wed, 30 Mar 2011 13:18:47 -0400
Subject: Implement quotas for the new v1.1 server metadata controller.
 Modified the compute API so that metadata is a dict (not an array) to ensure
 we are using unique key values for metadata. This is isn't explicit in the
 SPECs but it is implied by the new v1.1 spec since PUT requests modify
 individual items.

Re-enabled the metadata integration test.
---
 nova/tests/api/openstack/test_server_metadata.py | 38 ++++++++++
 nova/tests/integrated/test_servers.py            | 88 ++++++++++++------------
 2 files changed, 82 insertions(+), 44 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_server_metadata.py b/nova/tests/api/openstack/test_server_metadata.py
index c8d456472..3ae97c2ef 100644
--- a/nova/tests/api/openstack/test_server_metadata.py
+++ b/nova/tests/api/openstack/test_server_metadata.py
@@ -21,11 +21,17 @@ import unittest
 import webob
 
 
+from nova import flags
 from nova.api import openstack
 from nova.tests.api.openstack import fakes
 import nova.wsgi
 
 
+FLAGS = flags.FLAGS
+
+def return_create_instance_metadata_max(context, server_id, metadata):
+    return stub_max_server_metadata()
+
 def return_create_instance_metadata(context, server_id, metadata):
     return stub_server_metadata()
 
@@ -53,6 +59,12 @@ def stub_server_metadata():
     return metadata
 
 
+def stub_max_server_metadata():
+    metadata = {"metadata": {}}
+    for num in range(FLAGS.quota_metadata_items):
+        metadata['metadata']['key%i' % num] = "blah"
+    return metadata
+
 class ServerMetaDataTest(unittest.TestCase):
 
     def setUp(self):
@@ -162,3 +174,29 @@ class ServerMetaDataTest(unittest.TestCase):
         req.headers["content-type"] = "application/json"
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(400, res.status_int)
+
+    def test_too_many_metadata_items_on_create(self):
+        self.stubs.Set(nova.db.api, 'instance_metadata_update_or_create',
+                        return_create_instance_metadata)
+        data = {"metadata": {}}
+        for num in range(FLAGS.quota_metadata_items + 1):
+            data['metadata']['key%i' % num] = "blah"
+        json_string = str(data).replace("\'", "\"")
+        req = webob.Request.blank('/v1.1/servers/1/meta')
+        req.environ['api.version'] = '1.1'
+        req.method = 'POST'
+        req.body = json_string
+        req.headers["content-type"] = "application/json"
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(400, res.status_int)
+
+    def test_to_many_metadata_items_on_update_item(self):
+        self.stubs.Set(nova.db.api, 'instance_metadata_update_or_create',
+                        return_create_instance_metadata_max)
+        req = webob.Request.blank('/v1.1/servers/1/meta/key1')
+        req.environ['api.version'] = '1.1'
+        req.method = 'PUT'
+        req.body = '{"a new key": "a new value"}'
+        req.headers["content-type"] = "application/json"
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(400, res.status_int)
diff --git a/nova/tests/integrated/test_servers.py b/nova/tests/integrated/test_servers.py
index 749ea8955..8175659a3 100644
--- a/nova/tests/integrated/test_servers.py
+++ b/nova/tests/integrated/test_servers.py
@@ -134,50 +134,50 @@ class ServersTest(integrated_helpers._IntegratedTestBase):
         # Should be gone
         self.assertFalse(found_server)
 
-# TODO(justinsb): Enable this unit test when the metadata bug is fixed
-#    def test_create_server_with_metadata(self):
-#        """Creates a server with metadata"""
-#
-#        # Build the server data gradually, checking errors along the way
-#        server = self._build_minimal_create_server_request()
-#
-#        for metadata_count in range(30):
-#            metadata = {}
-#            for i in range(metadata_count):
-#                metadata['key_%s' % i] = 'value_%s' % i
-#            server['metadata'] = metadata
-#
-#            post = {'server': server}
-#            created_server = self.api.post_server(post)
-#            LOG.debug("created_server: %s" % created_server)
-#            self.assertTrue(created_server['id'])
-#            created_server_id = created_server['id']
-#            # Reenable when bug fixed
-#            # self.assertEqual(metadata, created_server.get('metadata'))
-#
-#            # Check it's there
-#            found_server = self.api.get_server(created_server_id)
-#            self.assertEqual(created_server_id, found_server['id'])
-#            self.assertEqual(metadata, found_server.get('metadata'))
-#
-#            # The server should also be in the all-servers details list
-#            servers = self.api.get_servers(detail=True)
-#            server_map = dict((server['id'], server) for server in servers)
-#            found_server = server_map.get(created_server_id)
-#            self.assertTrue(found_server)
-#            # Details do include metadata
-#            self.assertEqual(metadata, found_server.get('metadata'))
-#
-#            # The server should also be in the all-servers summary list
-#            servers = self.api.get_servers(detail=False)
-#            server_map = dict((server['id'], server) for server in servers)
-#            found_server = server_map.get(created_server_id)
-#            self.assertTrue(found_server)
-#            # Summary should not include metadata
-#            self.assertFalse(found_server.get('metadata'))
-#
-#            # Cleanup
-#            self._delete_server(created_server_id)
+    def test_create_server_with_metadata(self):
+        """Creates a server with metadata"""
+
+        # Build the server data gradually, checking errors along the way
+        server = self._build_minimal_create_server_request()
+
+        metadata = {}
+        for i in range(30):
+            metadata['key_%s' % i] = 'value_%s' % i
+
+        server['metadata'] = metadata
+
+        post = {'server': server}
+        created_server = self.api.post_server(post)
+        LOG.debug("created_server: %s" % created_server)
+        self.assertTrue(created_server['id'])
+        created_server_id = created_server['id']
+
+        # Reenable when bug fixed
+        self.assertEqual(metadata, created_server.get('metadata'))
+        # Check it's there
+
+        found_server = self.api.get_server(created_server_id)
+        self.assertEqual(created_server_id, found_server['id'])
+        self.assertEqual(metadata, found_server.get('metadata'))
+
+        # The server should also be in the all-servers details list
+        servers = self.api.get_servers(detail=True)
+        server_map = dict((server['id'], server) for server in servers)
+        found_server = server_map.get(created_server_id)
+        self.assertTrue(found_server)
+        # Details do include metadata
+        self.assertEqual(metadata, found_server.get('metadata'))
+
+        # The server should also be in the all-servers summary list
+        servers = self.api.get_servers(detail=False)
+        server_map = dict((server['id'], server) for server in servers)
+        found_server = server_map.get(created_server_id)
+        self.assertTrue(found_server)
+        # Summary should not include metadata
+        self.assertFalse(found_server.get('metadata'))
+
+        # Cleanup
+        self._delete_server(created_server_id)
 
 
 if __name__ == "__main__":
-- 
cgit 


From 82759db16019509b9ca77fb7d86015d29c598f70 Mon Sep 17 00:00:00 2001
From: Dan Prince <dan.prince@rackspace.com>
Date: Wed, 30 Mar 2011 13:34:45 -0400
Subject: pep8 fixes.

---
 nova/tests/api/openstack/test_server_metadata.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_server_metadata.py b/nova/tests/api/openstack/test_server_metadata.py
index 3ae97c2ef..fc51370f6 100644
--- a/nova/tests/api/openstack/test_server_metadata.py
+++ b/nova/tests/api/openstack/test_server_metadata.py
@@ -29,9 +29,11 @@ import nova.wsgi
 
 FLAGS = flags.FLAGS
 
+
 def return_create_instance_metadata_max(context, server_id, metadata):
     return stub_max_server_metadata()
 
+
 def return_create_instance_metadata(context, server_id, metadata):
     return stub_server_metadata()
 
@@ -65,6 +67,7 @@ def stub_max_server_metadata():
         metadata['metadata']['key%i' % num] = "blah"
     return metadata
 
+
 class ServerMetaDataTest(unittest.TestCase):
 
     def setUp(self):
-- 
cgit 


From ee709d39e6c66ec4aad722fb20951ae9d714f259 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Wed, 30 Mar 2011 10:41:22 -0700
Subject: Some tests actually tested for the lack of a namespace :-)

---
 nova/tests/api/openstack/test_images.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py
index 57e447dce..ff3fe8976 100644
--- a/nova/tests/api/openstack/test_images.py
+++ b/nova/tests/api/openstack/test_images.py
@@ -146,7 +146,7 @@ class LocalImageServiceTest(_BaseImageServiceTests):
         for x in [1, 2, 3]:
             tempfile.mkstemp(prefix='ami-', dir=self.tempdir)
         # create some valid image directories names
-        for x in ["1485baed", "1a60f0ee",  "3123a73d"]:
+        for x in ["1485baed", "1a60f0ee", "3123a73d"]:
             os.makedirs(os.path.join(self.tempdir, x))
         found_image_ids = self.service._ids()
         self.assertEqual(True, isinstance(found_image_ids, list))
@@ -334,7 +334,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
                     name="public image"
                     updated="%(expected_now)s"
                     created="%(expected_now)s"
-                    status="ACTIVE" />
+                    status="ACTIVE"
+                    xmlns="http://docs.rackspacecloud.com/servers/api/v1.0" />
         """ % (locals()))
 
         self.assertEqual(expected_image.toxml(), actual_image.toxml())
@@ -353,7 +354,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
                 name="public image"
                 updated="%(expected_now)s"
                 created="%(expected_now)s"
-                status="ACTIVE">
+                status="ACTIVE"
+                xmlns="http://docs.openstack.org/compute/api/v1.1">
             <links>
                 <link href="%(expected_href)s" rel="self"/>
                 <link href="%(expected_href)s" rel="bookmark"
@@ -389,7 +391,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
         self.assertEqual(404, response.status_int)
 
         expected = minidom.parseString("""
-            <itemNotFound code="404">
+            <itemNotFound code="404"
+                    xmlns="http://docs.rackspacecloud.com/servers/api/v1.0">
                 <message>
                     Image not found.
                 </message>
@@ -422,8 +425,11 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
         response = request.get_response(fakes.wsgi_app())
         self.assertEqual(404, response.status_int)
 
+        # NOTE(justinsb): I believe this should still use the v1.0 XSD,
+        # because the element hasn't changed definition
         expected = minidom.parseString("""
-            <itemNotFound code="404">
+            <itemNotFound code="404"
+                    xmlns="http://docs.rackspacecloud.com/servers/api/v1.0">
                 <message>
                     Image not found.
                 </message>
-- 
cgit 


From d2aa73efed6f4eb731c4fe8dca3f4ceb5b36caeb Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Wed, 30 Mar 2011 10:49:09 -0700
Subject: More tests that were checking for no-namespace

---
 nova/tests/api/openstack/test_faults.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_faults.py b/nova/tests/api/openstack/test_faults.py
index 7667753f4..505e7e308 100644
--- a/nova/tests/api/openstack/test_faults.py
+++ b/nova/tests/api/openstack/test_faults.py
@@ -20,6 +20,7 @@ import webob.dec
 import webob.exc
 
 from nova import test
+from nova.api.openstack import common
 from nova.api.openstack import faults
 
 
@@ -30,8 +31,11 @@ class TestFaults(test.TestCase):
         f = faults.Fault(webob.exc.HTTPBadRequest(explanation='scram'))
         resp = req.get_response(f)
 
-        first_two_words = resp.body.strip().split()[:2]
-        self.assertEqual(first_two_words, ['<badRequest', 'code="400">'])
+        first_three_words = resp.body.strip().split()[:3]
+        self.assertEqual(first_three_words,
+                         ['<badRequest',
+                          'code="400"',
+                          'xmlns="%s">' % common.XML_NS_V10])
         body_without_spaces = ''.join(resp.body.split())
         self.assertTrue('<message>scram</message>' in body_without_spaces)
 
@@ -41,8 +45,11 @@ class TestFaults(test.TestCase):
                                                   headers={'Retry-After': 4})
         f = faults.Fault(exc)
         resp = req.get_response(f)
-        first_two_words = resp.body.strip().split()[:2]
-        self.assertEqual(first_two_words, ['<overLimit', 'code="413">'])
+        first_three_words = resp.body.strip().split()[:3]
+        self.assertEqual(first_three_words,
+                         ['<overLimit',
+                          'code="413"',
+                          'xmlns="%s">' % common.XML_NS_V10])
         body_sans_spaces = ''.join(resp.body.split())
         self.assertTrue('<message>sorry</message>' in body_sans_spaces)
         self.assertTrue('<retryAfter>4</retryAfter>' in body_sans_spaces)
-- 
cgit 


From 168fdb09f369287f3ec8c19ef73915280ff79d20 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Wed, 30 Mar 2011 11:15:16 -0700
Subject: Refixed unit test to check XML ns

---
 nova/tests/api/openstack/test_faults.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_faults.py b/nova/tests/api/openstack/test_faults.py
index b3433f45f..4d86ffb26 100644
--- a/nova/tests/api/openstack/test_faults.py
+++ b/nova/tests/api/openstack/test_faults.py
@@ -48,10 +48,10 @@ class TestFaults(test.TestCase):
             response = request.get_response(fault)
 
             expected = self._prepare_xml("""
-                <badRequest code="400">
+                <badRequest code="400" xmlns="%s">
                     <message>scram</message>
                 </badRequest>
-            """)
+            """ % common.XML_NS_V10)
             actual = self._prepare_xml(response.body)
 
             self.assertEqual(response.content_type, "application/xml")
@@ -92,11 +92,11 @@ class TestFaults(test.TestCase):
             response = request.get_response(fault)
 
             expected = self._prepare_xml("""
-                <overLimit code="413">
+                <overLimit code="413" xmlns="%s">
                     <message>sorry</message>
                     <retryAfter>4</retryAfter>
                 </overLimit>
-            """)
+            """ % common.XML_NS_V10)
             actual = self._prepare_xml(response.body)
 
             self.assertEqual(expected, actual)
-- 
cgit 


From 1703592992ebdd5bbf19952f79f05022a4cdc849 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Wed, 30 Mar 2011 12:34:10 -0700
Subject: remove all references to image_type and change nova-manage upload to
 set container format more intelligently

---
 nova/tests/api/openstack/test_image_metadata.py | 2 --
 1 file changed, 2 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_image_metadata.py b/nova/tests/api/openstack/test_image_metadata.py
index 9be753f84..7c3287006 100644
--- a/nova/tests/api/openstack/test_image_metadata.py
+++ b/nova/tests/api/openstack/test_image_metadata.py
@@ -45,7 +45,6 @@ class ImageMetaDataTest(unittest.TestCase):
         'is_public': True,
         'deleted_at': None,
         'properties': {
-            'type': 'ramdisk',
             'key1': 'value1',
             'key2': 'value2'
         },
@@ -62,7 +61,6 @@ class ImageMetaDataTest(unittest.TestCase):
         'is_public': True,
         'deleted_at': None,
         'properties': {
-            'type': 'ramdisk',
             'key1': 'value1',
             'key2': 'value2'
         },
-- 
cgit 


From 176d98aa179b174c4e4a5621f723ef7b9145e3cb Mon Sep 17 00:00:00 2001
From: Dan Prince <dan.prince@rackspace.com>
Date: Wed, 30 Mar 2011 15:47:12 -0400
Subject: Update docstrings and spacing.

---
 nova/tests/api/openstack/test_server_metadata.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_server_metadata.py b/nova/tests/api/openstack/test_server_metadata.py
index fc51370f6..862e14b7c 100644
--- a/nova/tests/api/openstack/test_server_metadata.py
+++ b/nova/tests/api/openstack/test_server_metadata.py
@@ -84,7 +84,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_index(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_get',
-                        return_server_metadata)
+                       return_server_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta')
         req.environ['api.version'] = '1.1'
         res = req.get_response(fakes.wsgi_app())
@@ -94,7 +94,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_index_no_data(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_get',
-                        return_empty_server_metadata)
+                       return_empty_server_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta')
         req.environ['api.version'] = '1.1'
         res = req.get_response(fakes.wsgi_app())
@@ -104,7 +104,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_show(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_get',
-                        return_server_metadata)
+                       return_server_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta/key5')
         req.environ['api.version'] = '1.1'
         res = req.get_response(fakes.wsgi_app())
@@ -114,7 +114,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_show_meta_not_found(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_get',
-                        return_empty_server_metadata)
+                       return_empty_server_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta/key6')
         req.environ['api.version'] = '1.1'
         res = req.get_response(fakes.wsgi_app())
@@ -123,7 +123,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_delete(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_delete',
-                        delete_server_metadata)
+                       delete_server_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta/key5')
         req.environ['api.version'] = '1.1'
         req.method = 'DELETE'
@@ -132,7 +132,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_create(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_update_or_create',
-                        return_create_instance_metadata)
+                       return_create_instance_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta')
         req.environ['api.version'] = '1.1'
         req.method = 'POST'
@@ -145,7 +145,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_update_item(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_update_or_create',
-                        return_create_instance_metadata)
+                       return_create_instance_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta/key1')
         req.environ['api.version'] = '1.1'
         req.method = 'PUT'
@@ -158,7 +158,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_update_item_too_many_keys(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_update_or_create',
-                        return_create_instance_metadata)
+                       return_create_instance_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta/key1')
         req.environ['api.version'] = '1.1'
         req.method = 'PUT'
@@ -169,7 +169,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_update_item_body_uri_mismatch(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_update_or_create',
-                        return_create_instance_metadata)
+                       return_create_instance_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta/bad')
         req.environ['api.version'] = '1.1'
         req.method = 'PUT'
@@ -180,7 +180,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_too_many_metadata_items_on_create(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_update_or_create',
-                        return_create_instance_metadata)
+                       return_create_instance_metadata)
         data = {"metadata": {}}
         for num in range(FLAGS.quota_metadata_items + 1):
             data['metadata']['key%i' % num] = "blah"
@@ -195,7 +195,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_to_many_metadata_items_on_update_item(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_update_or_create',
-                        return_create_instance_metadata_max)
+                       return_create_instance_metadata_max)
         req = webob.Request.blank('/v1.1/servers/1/meta/key1')
         req.environ['api.version'] = '1.1'
         req.method = 'PUT'
-- 
cgit 


From b54b6c200092054e38af1fa1e5885fe915e53149 Mon Sep 17 00:00:00 2001
From: John Tran <jtran@attinteractive.com>
Date: Wed, 30 Mar 2011 13:10:11 -0700
Subject: submitting a unit test for terminate_instance

---
 nova/tests/test_cloud.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/test_cloud.py b/nova/tests/test_cloud.py
index 00803d0ad..be1939193 100644
--- a/nova/tests/test_cloud.py
+++ b/nova/tests/test_cloud.py
@@ -36,6 +36,7 @@ from nova import rpc
 from nova import service
 from nova import test
 from nova import utils
+from nova import exception
 from nova.auth import manager
 from nova.compute import power_state
 from nova.api.ec2 import cloud
@@ -310,6 +311,19 @@ class CloudTestCase(test.TestCase):
                 LOG.debug(_("Terminating instance %s"), instance_id)
                 rv = self.compute.terminate_instance(instance_id)
 
+    def test_terminate_instances(self):
+        inst1 = db.instance_create(self.context, {'reservation_id': 'a',
+                                                  'image_id': 1,
+                                                  'host': 'host1'})
+        terminate_instances = self.cloud.terminate_instances
+        # valid instance_id
+        result = terminate_instances(self.context, ['i-00000001'])
+        self.assertTrue(result)
+        # non-existing instance_id
+        self.assertRaises(exception.InstanceNotFound, terminate_instances,
+                          self.context, ['i-2'])
+        db.instance_destroy(self.context, inst1['id'])
+
     def test_update_of_instance_display_fields(self):
         inst = db.instance_create(self.context, {})
         ec2_id = ec2utils.id_to_ec2_id(inst['id'])
-- 
cgit 


From 7f98416fdba59c4305f88a30a457bbf6c68ef372 Mon Sep 17 00:00:00 2001
From: Dan Prince <dan.prince@rackspace.com>
Date: Thu, 31 Mar 2011 09:20:47 -0400
Subject: Limit image metadata to the configured metadata quota for a project.

---
 nova/tests/api/openstack/test_image_metadata.py | 39 +++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_image_metadata.py b/nova/tests/api/openstack/test_image_metadata.py
index 9be753f84..51f64680b 100644
--- a/nova/tests/api/openstack/test_image_metadata.py
+++ b/nova/tests/api/openstack/test_image_metadata.py
@@ -67,6 +67,19 @@ class ImageMetaDataTest(unittest.TestCase):
             'key2': 'value2'
         },
         'size': 5882349},
+        {'status': 'active',
+        'name': 'image3',
+        'deleted': False,
+        'container_format': None,
+        'created_at': '2011-03-22T17:40:15',
+        'disk_format': None,
+        'updated_at': '2011-03-22T17:40:15',
+        'id': '3',
+        'location': 'file:///var/lib/glance/images/2',
+        'is_public': True,
+        'deleted_at': None,
+        'properties': {},
+        'size': 5882349},
         ]
 
     def setUp(self):
@@ -77,6 +90,10 @@ class ImageMetaDataTest(unittest.TestCase):
         fakes.FakeAuthManager.auth_data = {}
         fakes.FakeAuthDatabase.data = {}
         fakes.stub_out_auth(self.stubs)
+        # NOTE(dprince) max out properties/metadata in image 3 for testing
+        img3 = self.IMAGE_FIXTURES[2]
+        for num in range(FLAGS.quota_metadata_items):
+            img3['properties']['key%i' % num] = "blah"
         fakes.stub_out_glance(self.stubs, self.IMAGE_FIXTURES)
 
     def tearDown(self):
@@ -164,3 +181,25 @@ class ImageMetaDataTest(unittest.TestCase):
         req.method = 'DELETE'
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(404, res.status_int)
+
+    def test_too_many_metadata_items_on_create(self):
+        data = {"metadata": {}}
+        for num in range(FLAGS.quota_metadata_items + 1):
+            data['metadata']['key%i' % num] = "blah"
+        json_string = str(data).replace("\'", "\"")
+        req = webob.Request.blank('/v1.1/images/2/meta')
+        req.environ['api.version'] = '1.1'
+        req.method = 'POST'
+        req.body = json_string
+        req.headers["content-type"] = "application/json"
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(400, res.status_int)
+
+    def test_too_many_metadata_items_on_put(self):
+        req = webob.Request.blank('/v1.1/images/3/meta/blah')
+        req.environ['api.version'] = '1.1'
+        req.method = 'PUT'
+        req.body = '{"blah": "blah"}'
+        req.headers["content-type"] = "application/json"
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(400, res.status_int)
-- 
cgit 


From a8d186d212ffbc628fc2b2672eca1e0557c57414 Mon Sep 17 00:00:00 2001
From: Eldar Nugaev <enugaev@griddynamics.com>
Date: Sun, 3 Apr 2011 03:45:33 +0400
Subject: split up to_xml to creation xml_info and filling the template

---
 nova/tests/test_virt.py | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index 958c8e3e2..62afcd1f1 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -31,9 +31,7 @@ from nova import test
 from nova import utils
 from nova.api.ec2 import cloud
 from nova.auth import manager
-from nova.compute import manager as compute_manager
 from nova.compute import power_state
-from nova.db.sqlalchemy import models
 from nova.virt import libvirt_conn
 
 libvirt = None
@@ -269,7 +267,7 @@ class LibvirtConnTestCase(test.TestCase):
         self.assertTrue(len(target) > 0)
 
     def _check_xml_and_uri(self, instance, expect_ramdisk, expect_kernel,
-                           rescue=False):
+                           rescue=False, network_info=None):
         user_context = context.RequestContext(project=self.project,
                                               user=self.user)
         instance_ref = db.instance_create(user_context, instance)
@@ -327,19 +325,13 @@ class LibvirtConnTestCase(test.TestCase):
                     check = (lambda t: t.find('./os/initrd'), None)
                 check_list.append(check)
 
+        parameter = './devices/interface/filterref/parameter'
         common_checks = [
             (lambda t: t.find('.').tag, 'domain'),
-            (lambda t: t.find(
-                './devices/interface/filterref/parameter').get('name'), 'IP'),
-            (lambda t: t.find(
-                './devices/interface/filterref/parameter').get(
-                    'value'), '10.11.12.13'),
-            (lambda t: t.findall(
-                './devices/interface/filterref/parameter')[1].get(
-                    'name'), 'DHCPSERVER'),
-            (lambda t: t.findall(
-                './devices/interface/filterref/parameter')[1].get(
-                    'value'), '10.0.0.1'),
+            (lambda t: t.find(parameter).get('name'), 'IP'),
+            (lambda t: t.find(parameter).get('value'), '10.11.12.13'),
+            (lambda t: t.findall(parameter)[1].get('name'), 'DHCPSERVER'),
+            (lambda t: t.findall(parameter)[1].get('value'), '10.0.0.1'),
             (lambda t: t.find('./devices/serial/source').get(
                 'path').split('/')[1], 'console.log'),
             (lambda t: t.find('./memory').text, '2097152')]
-- 
cgit 


From 74d9a325a452fb927e5edddca3f1b7edd35d1496 Mon Sep 17 00:00:00 2001
From: Eldar Nugaev <enugaev@griddynamics.com>
Date: Sun, 3 Apr 2011 21:18:35 +0400
Subject: added preparing_xml test

---
 nova/tests/test_virt.py | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index 62afcd1f1..319544099 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -192,6 +192,47 @@ class LibvirtConnTestCase(test.TestCase):
 
         return db.service_create(context.get_admin_context(), service_ref)
 
+
+    def _create_network_info(self, count=1):
+        fake = 'fake'
+        fake_ip = '0.0.0.0/0'
+        network = {'gateway': fake,
+                   'gateway_v6': fake,
+                   'bridge': fake,
+                   'cidr': fake_ip,
+                   'cidr_v6': fake_ip}
+        mapping = {'mac': fake,
+                   'ips': [{'ip': fake_ip}]}
+
+        return [(network, mapping) for x in xrange(0, count)]
+
+    def test_preparing_xml_info(self):
+        conn = libvirt_conn.LibvirtConnection(True)
+        instance_ref = db.instance_create(self.context, self.test_instance)
+
+        result = conn._prepare_xml_info(instance_ref, False)
+        self.assertFalse(result['nics'])
+
+        result = conn._prepare_xml_info(instance_ref, False,
+                                        self._create_network_info())
+        self.assertTrue(len(result['nics']) == 1)
+
+        result = conn._prepare_xml_info(instance_ref, False,
+                                        self._create_network_info(2))
+        self.assertTrue(len(result['nics']) == 2)
+
+    def test_get_nic_for_xml(self):
+        conn = libvirt_conn.LibvirtConnection(True)
+        network, mapping = self._create_network_info()[0]
+        FLAGS.use_ipv6 = False
+        params_1 = conn._get_nic_for_xml(network, mapping)['extra_params']
+        FLAGS.use_ipv6 = True
+        params_2 = conn._get_nic_for_xml(network, mapping)['extra_params']
+        self.assertTrue(params_1.find('PROJNETV6') == -1)
+        self.assertTrue(params_1.find('PROJMASKV6') == -1)
+        self.assertTrue(params_2.find('PROJNETV6') > -1)
+        self.assertTrue(params_2.find('PROJMASKV6') > -1)
+
     def test_xml_and_uri_no_ramdisk_no_kernel(self):
         instance_data = dict(self.test_instance)
         self._check_xml_and_uri(instance_data,
-- 
cgit 


From 8969cb1f22a7760dc7e17c578a686f088b1a8d89 Mon Sep 17 00:00:00 2001
From: Eldar Nugaev <enugaev@griddynamics.com>
Date: Sun, 3 Apr 2011 22:50:38 +0400
Subject: add multi_nic_test

---
 nova/tests/test_virt.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index 319544099..b6482503e 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -192,7 +192,6 @@ class LibvirtConnTestCase(test.TestCase):
 
         return db.service_create(context.get_admin_context(), service_ref)
 
-
     def _create_network_info(self, count=1):
         fake = 'fake'
         fake_ip = '0.0.0.0/0'
@@ -224,6 +223,7 @@ class LibvirtConnTestCase(test.TestCase):
     def test_get_nic_for_xml(self):
         conn = libvirt_conn.LibvirtConnection(True)
         network, mapping = self._create_network_info()[0]
+        backup = FLAGS.use_ipv6
         FLAGS.use_ipv6 = False
         params_1 = conn._get_nic_for_xml(network, mapping)['extra_params']
         FLAGS.use_ipv6 = True
@@ -232,6 +232,7 @@ class LibvirtConnTestCase(test.TestCase):
         self.assertTrue(params_1.find('PROJMASKV6') == -1)
         self.assertTrue(params_2.find('PROJNETV6') > -1)
         self.assertTrue(params_2.find('PROJMASKV6') > -1)
+        FLAGS.use_ipv6 = backup
 
     def test_xml_and_uri_no_ramdisk_no_kernel(self):
         instance_data = dict(self.test_instance)
@@ -268,6 +269,15 @@ class LibvirtConnTestCase(test.TestCase):
         instance_data = dict(self.test_instance)
         self._check_xml_and_container(instance_data)
 
+    def test_multi_nic(self):
+        instance_data = dict(self.test_instance)
+        network_info = self._create_network_info(2)
+        conn = libvirt_conn.LibvirtConnection(True)
+        instance_ref = db.instance_create(self.context, instance_data)
+        xml = conn.to_xml(instance_ref, False, network_info)
+        tree = xml_to_tree(xml)
+        self.assertEquals(len(tree.findall("./devices/interface")), 2)
+
     def _check_xml_and_container(self, instance):
         user_context = context.RequestContext(project=self.project,
                                               user=self.user)
@@ -308,7 +318,7 @@ class LibvirtConnTestCase(test.TestCase):
         self.assertTrue(len(target) > 0)
 
     def _check_xml_and_uri(self, instance, expect_ramdisk, expect_kernel,
-                           rescue=False, network_info=None):
+                           rescue=False):
         user_context = context.RequestContext(project=self.project,
                                               user=self.user)
         instance_ref = db.instance_create(user_context, instance)
-- 
cgit 


From 80549a0085e7c3a90b117b4c9df5a77b4ecd0843 Mon Sep 17 00:00:00 2001
From: Eldar Nugaev <enugaev@griddynamics.com>
Date: Mon, 4 Apr 2011 18:33:50 +0400
Subject: improving tests

---
 nova/tests/test_virt.py | 76 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 54 insertions(+), 22 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index b6482503e..ae813cb80 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -44,6 +44,22 @@ def _concurrency(wait, done, target):
     done.send()
 
 
+def _create_network_info(count=1):
+    fake = 'fake'
+    fake_ip = '0.0.0.0/0'
+    fake_ip_2 = '0.0.0.1/0'
+    fake_ip_3 = '0.0.0.1/0'
+    network = {'gateway': fake,
+               'gateway_v6': fake,
+               'bridge': fake,
+               'cidr': fake_ip,
+               'cidr_v6': fake_ip}
+    mapping = {'mac': fake,
+               'ips': [{'ip': fake_ip}, {'ip': fake_ip}],
+               'ip6s': [{'ip': fake_ip}, {'ip': fake_ip_2}, {'ip': fake_ip_3}]}
+    return [(network, mapping) for x in xrange(0, count)]
+
+
 class CacheConcurrencyTestCase(test.TestCase):
     def setUp(self):
         super(CacheConcurrencyTestCase, self).setUp()
@@ -192,19 +208,6 @@ class LibvirtConnTestCase(test.TestCase):
 
         return db.service_create(context.get_admin_context(), service_ref)
 
-    def _create_network_info(self, count=1):
-        fake = 'fake'
-        fake_ip = '0.0.0.0/0'
-        network = {'gateway': fake,
-                   'gateway_v6': fake,
-                   'bridge': fake,
-                   'cidr': fake_ip,
-                   'cidr_v6': fake_ip}
-        mapping = {'mac': fake,
-                   'ips': [{'ip': fake_ip}]}
-
-        return [(network, mapping) for x in xrange(0, count)]
-
     def test_preparing_xml_info(self):
         conn = libvirt_conn.LibvirtConnection(True)
         instance_ref = db.instance_create(self.context, self.test_instance)
@@ -213,16 +216,16 @@ class LibvirtConnTestCase(test.TestCase):
         self.assertFalse(result['nics'])
 
         result = conn._prepare_xml_info(instance_ref, False,
-                                        self._create_network_info())
+                                        _create_network_info())
         self.assertTrue(len(result['nics']) == 1)
 
         result = conn._prepare_xml_info(instance_ref, False,
-                                        self._create_network_info(2))
+                                        _create_network_info(2))
         self.assertTrue(len(result['nics']) == 2)
 
     def test_get_nic_for_xml(self):
         conn = libvirt_conn.LibvirtConnection(True)
-        network, mapping = self._create_network_info()[0]
+        network, mapping = _create_network_info()[0]
         backup = FLAGS.use_ipv6
         FLAGS.use_ipv6 = False
         params_1 = conn._get_nic_for_xml(network, mapping)['extra_params']
@@ -271,12 +274,19 @@ class LibvirtConnTestCase(test.TestCase):
 
     def test_multi_nic(self):
         instance_data = dict(self.test_instance)
-        network_info = self._create_network_info(2)
+        network_info = _create_network_info(2)
         conn = libvirt_conn.LibvirtConnection(True)
         instance_ref = db.instance_create(self.context, instance_data)
         xml = conn.to_xml(instance_ref, False, network_info)
         tree = xml_to_tree(xml)
-        self.assertEquals(len(tree.findall("./devices/interface")), 2)
+        interfaces = tree.findall("./devices/interface")
+        self.assertEquals(len(interfaces), 2)
+        parameters = interfaces[0].findall('./filterref/parameter')
+        self.assertEquals(interfaces[0].get('type'), 'bridge')
+        self.assertEquals(parameters[0].get('name'), 'IP')
+        self.assertEquals(parameters[0].get('value'), '0.0.0.0/0')
+        self.assertEquals(parameters[1].get('name'), 'DHCPSERVER')
+        self.assertEquals(parameters[1].get('value'), 'fake')
 
     def _check_xml_and_container(self, instance):
         user_context = context.RequestContext(project=self.project,
@@ -656,11 +666,14 @@ class IptablesFirewallTestCase(test.TestCase):
       '# Completed on Tue Jan 18 23:47:56 2011',
     ]
 
+    def _create_instance_ref(self):
+        return db.instance_create(self.context,
+                                  {'user_id': 'fake',
+                                   'project_id': 'fake',
+                                   'mac_address': '56:12:12:12:12:12'})
+
     def test_static_filters(self):
-        instance_ref = db.instance_create(self.context,
-                                          {'user_id': 'fake',
-                                          'project_id': 'fake',
-                                          'mac_address': '56:12:12:12:12:12'})
+        instance_ref = self._create_instance_ref()
         ip = '10.11.12.13'
 
         network_ref = db.project_get_network(self.context,
@@ -771,6 +784,25 @@ class IptablesFirewallTestCase(test.TestCase):
                         "TCP port 80/81 acceptance rule wasn't added")
         db.instance_destroy(admin_ctxt, instance_ref['id'])
 
+    def test_filters_for_instance(self):
+        network_info = _create_network_info()
+        rulesv4, rulesv6 = self.fw._filters_for_instance("fake", network_info)
+        self.assertEquals(len(rulesv4), 2)
+        self.assertEquals(len(rulesv6), 3)
+
+    def multinic_iptables_test(self):
+        instance_ref = self._create_instance_ref()
+        network_info = _create_network_info()
+        ipv4_len = len(self.fw.iptables.ipv4['filter'].rules)
+        ipv6_len = len(self.fw.iptables.ipv6['filter'].rules)
+        inst_ipv4, inst_ipv6 = self.fw.instance_rules(instance_ref,
+                                                      network_info)
+        self.fw.add_filters_for_instance(instance_ref, network_info)
+        ipv4 = self.fw.iptables.ipv4['filter'].rules
+        ipv6 = self.fw.iptables.ipv6['filter'].rules
+        self.assertEquals(len(ipv4) - len(inst_ipv4) - ipv4_len, 2)
+        self.assertEquals(len(ipv6) - len(inst_ipv6) - ipv6_len, 3)
+
 
 class NWFilterTestCase(test.TestCase):
     def setUp(self):
-- 
cgit 


From d7053efa810aa3d20ef7cd089429c6d96f451a7d Mon Sep 17 00:00:00 2001
From: Ilya Alekseyev <ialekseev@griddynamics.com>
Date: Mon, 4 Apr 2011 21:05:38 +0400
Subject: Fixed network_info creating.

---
 nova/tests/test_virt.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index 958c8e3e2..5a010d347 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -617,7 +617,8 @@ class IptablesFirewallTestCase(test.TestCase):
         instance_ref = db.instance_create(self.context,
                                           {'user_id': 'fake',
                                           'project_id': 'fake',
-                                          'mac_address': '56:12:12:12:12:12'})
+                                          'mac_address': '56:12:12:12:12:12',
+                                          'instance_type': 'm1.small'})
         ip = '10.11.12.13'
 
         network_ref = db.project_get_network(self.context,
@@ -840,7 +841,8 @@ class NWFilterTestCase(test.TestCase):
         instance_ref = db.instance_create(self.context,
                                           {'user_id': 'fake',
                                           'project_id': 'fake',
-                                          'mac_address': '00:A0:C9:14:C8:29'})
+                                          'mac_address': '00:A0:C9:14:C8:29',
+                                          'instance_type': 'm1.small'})
         inst_id = instance_ref['id']
 
         ip = '10.11.12.13'
-- 
cgit 


From 917f7aafbfa0a797687d10a600a218517f9b75e0 Mon Sep 17 00:00:00 2001
From: Eldar Nugaev <enugaev@griddynamics.com>
Date: Mon, 4 Apr 2011 22:22:27 +0400
Subject: add test for NWFilterFirewall

---
 nova/tests/test_virt.py | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index ae813cb80..b3d701efe 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -884,6 +884,12 @@ class NWFilterTestCase(test.TestCase):
 
         return db.security_group_get_by_name(self.context, 'fake', 'testgroup')
 
+    def _create_instance(self):
+        return db.instance_create(self.context,
+                                  {'user_id': 'fake',
+                                   'project_id': 'fake',
+                                   'mac_address': '00:A0:C9:14:C8:29'})
+
     def test_creates_base_rule_first(self):
         # These come pre-defined by libvirt
         self.defined_filters = ['no-mac-spoofing',
@@ -912,10 +918,7 @@ class NWFilterTestCase(test.TestCase):
 
         self.fake_libvirt_connection.nwfilterDefineXML = _filterDefineXMLMock
 
-        instance_ref = db.instance_create(self.context,
-                                          {'user_id': 'fake',
-                                          'project_id': 'fake',
-                                          'mac_address': '00:A0:C9:14:C8:29'})
+        instance_ref = self._create_instance()
         inst_id = instance_ref['id']
 
         ip = '10.11.12.13'
@@ -955,3 +958,11 @@ class NWFilterTestCase(test.TestCase):
         _ensure_all_called()
         self.teardown_security_group()
         db.instance_destroy(admin_ctxt, instance_ref['id'])
+
+
+    def test_create_network_filters(self):
+        instance_ref = self._create_instance()
+        network_info = _create_network_info(3)
+        result = \
+        self.fw._create_network_filters(instance_ref, network_info, "fake")
+        self.assertEquals(len(result), 3)
-- 
cgit 


From 5e74b5a5f121c9f0be2c529b76878615812d9483 Mon Sep 17 00:00:00 2001
From: Eldar Nugaev <enugaev@griddynamics.com>
Date: Mon, 4 Apr 2011 23:43:26 +0400
Subject: splitting test_get_nic_for_xml into two functions

---
 nova/tests/test_virt.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index b3d701efe..061797b04 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -226,16 +226,18 @@ class LibvirtConnTestCase(test.TestCase):
     def test_get_nic_for_xml(self):
         conn = libvirt_conn.LibvirtConnection(True)
         network, mapping = _create_network_info()[0]
-        backup = FLAGS.use_ipv6
-        FLAGS.use_ipv6 = False
-        params_1 = conn._get_nic_for_xml(network, mapping)['extra_params']
-        FLAGS.use_ipv6 = True
-        params_2 = conn._get_nic_for_xml(network, mapping)['extra_params']
-        self.assertTrue(params_1.find('PROJNETV6') == -1)
-        self.assertTrue(params_1.find('PROJMASKV6') == -1)
-        self.assertTrue(params_2.find('PROJNETV6') > -1)
-        self.assertTrue(params_2.find('PROJMASKV6') > -1)
-        FLAGS.use_ipv6 = backup
+        self.flags(use_ipv6=False)
+        params = conn._get_nic_for_xml(network, mapping)['extra_params']
+        self.assertTrue(params.find('PROJNETV6') == -1)
+        self.assertTrue(params.find('PROJMASKV6') == -1)
+
+    def test_get_nic_for_xml_v6(self):
+        conn = libvirt_conn.LibvirtConnection(True)
+        network, mapping = _create_network_info()[0]
+        self.flags(use_ipv6=True)
+        params = conn._get_nic_for_xml(network, mapping)['extra_params']
+        self.assertTrue(params.find('PROJNETV6') > -1)
+        self.assertTrue(params.find('PROJMASKV6') > -1)
 
     def test_xml_and_uri_no_ramdisk_no_kernel(self):
         instance_data = dict(self.test_instance)
@@ -959,7 +961,6 @@ class NWFilterTestCase(test.TestCase):
         self.teardown_security_group()
         db.instance_destroy(admin_ctxt, instance_ref['id'])
 
-
     def test_create_network_filters(self):
         instance_ref = self._create_instance()
         network_info = _create_network_info(3)
-- 
cgit 


From 38b4cd9e68d7e1c262b08474b277573440ec3e87 Mon Sep 17 00:00:00 2001
From: Dan Prince <dan.prince@rackspace.com>
Date: Mon, 4 Apr 2011 16:17:04 -0400
Subject: Refactor so that instances.instance_type is now
 instances.instance_type_id.

Update the Openstack API to return the correct flavor_id.
---
 nova/tests/api/openstack/test_servers.py | 24 ++++++++++++++----------
 nova/tests/db/fakes.py                   | 22 +++++++++++++++++-----
 nova/tests/test_compute.py               | 18 ++++++++++--------
 nova/tests/test_console.py               |  2 +-
 nova/tests/test_instance_types.py        |  6 +++++-
 nova/tests/test_quota.py                 | 17 +++++++++++------
 nova/tests/test_scheduler.py             |  2 +-
 nova/tests/test_virt.py                  |  2 +-
 nova/tests/test_volume.py                |  2 +-
 nova/tests/test_xenapi.py                | 12 ++++++------
 10 files changed, 67 insertions(+), 40 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index cb5047da9..899dcf7f7 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -32,6 +32,7 @@ from nova import test
 import nova.api.openstack
 from nova.api.openstack import servers
 import nova.compute.api
+from nova.compute import instance_types
 import nova.db.api
 from nova.db.sqlalchemy.models import Instance
 from nova.db.sqlalchemy.models import InstanceMetadata
@@ -71,13 +72,19 @@ def instance_address(context, instance_id):
     return None
 
 
-def stub_instance(id, user_id=1, private_address=None, public_addresses=None):
+def stub_instance(id, user_id=1, private_address=None, public_addresses=None,
+                  host=None):
     metadata = []
     metadata.append(InstanceMetadata(key='seq', value=id))
 
+    inst_type = instance_types.get_instance_type_by_flavor_id(1)
+
     if public_addresses == None:
         public_addresses = list()
 
+    if host != None:
+        host = str(host)
+
     instance = {
         "id": id,
         "admin_pass": "",
@@ -95,8 +102,8 @@ def stub_instance(id, user_id=1, private_address=None, public_addresses=None):
         "vcpus": 0,
         "local_gb": 0,
         "hostname": "",
-        "host": None,
-        "instance_type": "1",
+        "host": host,
+        "instance_type": dict(inst_type),
         "user_data": "",
         "reservation_id": "",
         "mac_address": "",
@@ -630,7 +637,7 @@ class ServersTest(test.TestCase):
             self.assertEqual(s['hostId'], '')
             self.assertEqual(s['name'], 'server%d' % i)
             self.assertEqual(s['imageId'], '10')
-            self.assertEqual(s['flavorId'], '1')
+            self.assertEqual(s['flavorId'], 1)
             self.assertEqual(s['metadata']['seq'], i)
 
     def test_get_all_server_details_v1_1(self):
@@ -654,12 +661,8 @@ class ServersTest(test.TestCase):
         instances - 2 on one host and 3 on another.
         '''
 
-        def stub_instance(id, user_id=1):
-            return Instance(id=id, state=0, image_id=10, user_id=user_id,
-                display_name='server%s' % id, host='host%s' % (id % 2))
-
         def return_servers_with_host(context, user_id=1):
-            return [stub_instance(i) for i in xrange(5)]
+            return [stub_instance(i, 1, None, None, i % 2) for i in xrange(5)]
 
         self.stubs.Set(nova.db.api, 'instance_get_all_by_user',
             return_servers_with_host)
@@ -677,7 +680,8 @@ class ServersTest(test.TestCase):
             self.assertEqual(s['id'], i)
             self.assertEqual(s['hostId'], host_ids[i % 2])
             self.assertEqual(s['name'], 'server%d' % i)
-            self.assertEqual(s['imageId'], 10)
+            self.assertEqual(s['imageId'], '10')
+            self.assertEqual(s['flavorId'], 1)
 
     def test_server_pause(self):
         FLAGS.allow_admin_api = True
diff --git a/nova/tests/db/fakes.py b/nova/tests/db/fakes.py
index 7ddfe377a..58d251b1e 100644
--- a/nova/tests/db/fakes.py
+++ b/nova/tests/db/fakes.py
@@ -28,29 +28,34 @@ def stub_out_db_instance_api(stubs, injected=True):
     """Stubs out the db API for creating Instances."""
 
     INSTANCE_TYPES = {
-        'm1.tiny': dict(memory_mb=512,
+        'm1.tiny': dict(id=2,
+                        memory_mb=512,
                         vcpus=1,
                         local_gb=0,
                         flavorid=1,
                         rxtx_cap=1),
-        'm1.small': dict(memory_mb=2048,
+        'm1.small': dict(id=5,
+                         memory_mb=2048,
                          vcpus=1,
                          local_gb=20,
                          flavorid=2,
                          rxtx_cap=2),
         'm1.medium':
-            dict(memory_mb=4096,
+            dict(id=1,
+                 memory_mb=4096,
                  vcpus=2,
                  local_gb=40,
                  flavorid=3,
                  rxtx_cap=3),
-        'm1.large': dict(memory_mb=8192,
+        'm1.large': dict(id=3,
+                         memory_mb=8192,
                          vcpus=4,
                          local_gb=80,
                          flavorid=4,
                          rxtx_cap=4),
         'm1.xlarge':
-            dict(memory_mb=16384,
+            dict(id=4,
+                 memory_mb=16384,
                  vcpus=8,
                  local_gb=160,
                  flavorid=5,
@@ -107,6 +112,12 @@ def stub_out_db_instance_api(stubs, injected=True):
     def fake_instance_type_get_by_name(context, name):
         return INSTANCE_TYPES[name]
 
+    def fake_instance_type_get_by_id(context, id):
+        for name, inst_type in INSTANCE_TYPES.iteritems():
+            if str(inst_type['id']) == str(id):
+                return inst_type
+        return None
+
     def fake_network_get_by_instance(context, instance_id):
         # Even instance numbers are on vlan networks
         if instance_id % 2 == 0:
@@ -136,6 +147,7 @@ def stub_out_db_instance_api(stubs, injected=True):
               fake_network_get_all_by_instance)
     stubs.Set(db, 'instance_type_get_all', fake_instance_type_get_all)
     stubs.Set(db, 'instance_type_get_by_name', fake_instance_type_get_by_name)
+    stubs.Set(db, 'instance_type_get_by_id', fake_instance_type_get_by_id)
     stubs.Set(db, 'instance_get_fixed_address',
         fake_instance_get_fixed_address)
     stubs.Set(db, 'instance_get_fixed_address_v6',
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 1b0f426d2..1917dff3e 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -84,7 +84,8 @@ class ComputeTestCase(test.TestCase):
         inst['launch_time'] = '10'
         inst['user_id'] = self.user.id
         inst['project_id'] = self.project.id
-        inst['instance_type'] = 'm1.tiny'
+        type_id = instance_types.get_instance_type_by_name('m1.tiny')['id']
+        inst['instance_type_id'] = type_id
         inst['mac_address'] = utils.generate_mac()
         inst['ami_launch_index'] = 0
         inst.update(params)
@@ -132,7 +133,7 @@ class ComputeTestCase(test.TestCase):
         cases = [dict(), dict(display_name=None)]
         for instance in cases:
             ref = self.compute_api.create(self.context,
-                FLAGS.default_instance_type, None, **instance)
+                instance_types.get_default_instance_type(), None, **instance)
             try:
                 self.assertNotEqual(ref[0]['display_name'], None)
             finally:
@@ -143,7 +144,7 @@ class ComputeTestCase(test.TestCase):
         group = self._create_group()
         ref = self.compute_api.create(
                 self.context,
-                instance_type=FLAGS.default_instance_type,
+                instance_type=instance_types.get_default_instance_type(),
                 image_id=None,
                 security_group=['testgroup'])
         try:
@@ -161,7 +162,7 @@ class ComputeTestCase(test.TestCase):
 
         ref = self.compute_api.create(
                 self.context,
-                instance_type=FLAGS.default_instance_type,
+                instance_type=instance_types.get_default_instance_type(),
                 image_id=None,
                 security_group=['testgroup'])
         try:
@@ -177,7 +178,7 @@ class ComputeTestCase(test.TestCase):
 
         ref = self.compute_api.create(
                 self.context,
-                instance_type=FLAGS.default_instance_type,
+                instance_type=instance_types.get_default_instance_type(),
                 image_id=None,
                 security_group=['testgroup'])
 
@@ -359,8 +360,9 @@ class ComputeTestCase(test.TestCase):
         instance_id = self._create_instance()
 
         self.compute.run_instance(self.context, instance_id)
+        inst_type = instance_types.get_instance_type_by_name('m1.xlarge')
         db.instance_update(self.context, instance_id,
-                {'instance_type': 'm1.xlarge'})
+                {'instance_type_id': inst_type['id']})
 
         self.assertRaises(exception.ApiError, self.compute_api.resize,
                 context, instance_id, 1)
@@ -380,8 +382,8 @@ class ComputeTestCase(test.TestCase):
         self.compute.terminate_instance(context, instance_id)
 
     def test_get_by_flavor_id(self):
-        type = instance_types.get_by_flavor_id(1)
-        self.assertEqual(type, 'm1.tiny')
+        type = instance_types.get_instance_type_by_flavor_id(1)
+        self.assertEqual(type['name'], 'm1.tiny')
 
     def test_resize_same_source_fails(self):
         """Ensure instance fails to migrate when source and destination are
diff --git a/nova/tests/test_console.py b/nova/tests/test_console.py
index d47c70d88..1a9a867ee 100644
--- a/nova/tests/test_console.py
+++ b/nova/tests/test_console.py
@@ -62,7 +62,7 @@ class ConsoleTestCase(test.TestCase):
         inst['launch_time'] = '10'
         inst['user_id'] = self.user.id
         inst['project_id'] = self.project.id
-        inst['instance_type'] = 'm1.tiny'
+        inst['instance_type_id'] = 1
         inst['mac_address'] = utils.generate_mac()
         inst['ami_launch_index'] = 0
         return db.instance_create(self.context, inst)['id']
diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py
index edc538879..5d6d5e1f4 100644
--- a/nova/tests/test_instance_types.py
+++ b/nova/tests/test_instance_types.py
@@ -40,7 +40,11 @@ class InstanceTypeTestCase(test.TestCase):
         max_flavorid = session.query(models.InstanceTypes).\
                                      order_by("flavorid desc").\
                                      first()
+        max_id = session.query(models.InstanceTypes).\
+                                     order_by("id desc").\
+                                     first()
         self.flavorid = max_flavorid["flavorid"] + 1
+        self.id = max_id["id"] + 1
         self.name = str(int(time.time()))
 
     def test_instance_type_create_then_delete(self):
@@ -53,7 +57,7 @@ class InstanceTypeTestCase(test.TestCase):
                             'instance type was not created')
         instance_types.destroy(self.name)
         self.assertEqual(1,
-                    instance_types.get_instance_type(self.name)["deleted"])
+                    instance_types.get_instance_type(self.id)["deleted"])
         self.assertEqual(starting_inst_list, instance_types.get_all_types())
         instance_types.purge(self.name)
         self.assertEqual(len(starting_inst_list),
diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py
index c65bc459d..39a123158 100644
--- a/nova/tests/test_quota.py
+++ b/nova/tests/test_quota.py
@@ -67,7 +67,7 @@ class QuotaTestCase(test.TestCase):
         inst['reservation_id'] = 'r-fakeres'
         inst['user_id'] = self.user.id
         inst['project_id'] = self.project.id
-        inst['instance_type'] = 'm1.large'
+        inst['instance_type_id'] = '3'  # m1.large
         inst['vcpus'] = cores
         inst['mac_address'] = utils.generate_mac()
         return db.instance_create(self.context, inst)['id']
@@ -124,11 +124,12 @@ class QuotaTestCase(test.TestCase):
         for i in range(FLAGS.quota_instances):
             instance_id = self._create_instance()
             instance_ids.append(instance_id)
+        inst_type = instance_types.get_instance_type_by_name('m1.small')
         self.assertRaises(quota.QuotaError, compute.API().create,
                                             self.context,
                                             min_count=1,
                                             max_count=1,
-                                            instance_type='m1.small',
+                                            instance_type=inst_type,
                                             image_id=1)
         for instance_id in instance_ids:
             db.instance_destroy(self.context, instance_id)
@@ -137,11 +138,12 @@ class QuotaTestCase(test.TestCase):
         instance_ids = []
         instance_id = self._create_instance(cores=4)
         instance_ids.append(instance_id)
+        inst_type = instance_types.get_instance_type_by_name('m1.small')
         self.assertRaises(quota.QuotaError, compute.API().create,
                                             self.context,
                                             min_count=1,
                                             max_count=1,
-                                            instance_type='m1.small',
+                                            instance_type=inst_type,
                                             image_id=1)
         for instance_id in instance_ids:
             db.instance_destroy(self.context, instance_id)
@@ -192,11 +194,12 @@ class QuotaTestCase(test.TestCase):
         metadata = {}
         for i in range(FLAGS.quota_metadata_items + 1):
             metadata['key%s' % i] = 'value%s' % i
+        inst_type = instance_types.get_instance_type_by_name('m1.small')
         self.assertRaises(quota.QuotaError, compute.API().create,
                                             self.context,
                                             min_count=1,
                                             max_count=1,
-                                            instance_type='m1.small',
+                                            instance_type=inst_type,
                                             image_id='fake',
                                             metadata=metadata)
 
@@ -207,13 +210,15 @@ class QuotaTestCase(test.TestCase):
 
     def _create_with_injected_files(self, files):
         api = compute.API(image_service=self.StubImageService())
+        inst_type = instance_types.get_instance_type_by_name('m1.small')
         api.create(self.context, min_count=1, max_count=1,
-                instance_type='m1.small', image_id='fake',
+                instance_type=inst_type, image_id='fake',
                 injected_files=files)
 
     def test_no_injected_files(self):
         api = compute.API(image_service=self.StubImageService())
-        api.create(self.context, instance_type='m1.small', image_id='fake')
+        inst_type = instance_types.get_instance_type_by_name('m1.small')
+        api.create(self.context, instance_type=inst_type, image_id='fake')
 
     def test_max_injected_files(self):
         files = []
diff --git a/nova/tests/test_scheduler.py b/nova/tests/test_scheduler.py
index 6df74dd61..ae56a1a16 100644
--- a/nova/tests/test_scheduler.py
+++ b/nova/tests/test_scheduler.py
@@ -263,7 +263,7 @@ class SimpleDriverTestCase(test.TestCase):
         inst['reservation_id'] = 'r-fakeres'
         inst['user_id'] = self.user.id
         inst['project_id'] = self.project.id
-        inst['instance_type'] = 'm1.tiny'
+        inst['instance_type_id'] = '1'
         inst['mac_address'] = utils.generate_mac()
         inst['vcpus'] = kwargs.get('vcpus', 1)
         inst['ami_launch_index'] = 0
diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index 958c8e3e2..c13cbf043 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -140,7 +140,7 @@ class LibvirtConnTestCase(test.TestCase):
                      'vcpus':         2,
                      'project_id':    'fake',
                      'bridge':        'br101',
-                     'instance_type': 'm1.small'}
+                     'instance_type_id': '5'}  # m1.small
 
     def lazy_load_library_exists(self):
         """check if libvirt is available."""
diff --git a/nova/tests/test_volume.py b/nova/tests/test_volume.py
index d71b75f3f..e9d8289aa 100644
--- a/nova/tests/test_volume.py
+++ b/nova/tests/test_volume.py
@@ -106,7 +106,7 @@ class VolumeTestCase(test.TestCase):
         inst['launch_time'] = '10'
         inst['user_id'] = 'fake'
         inst['project_id'] = 'fake'
-        inst['instance_type'] = 'm1.tiny'
+        inst['instance_type_id'] = '2'  # m1.tiny
         inst['mac_address'] = utils.generate_mac()
         inst['ami_launch_index'] = 0
         instance_id = db.instance_create(self.context, inst)['id']
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 17e3f55e9..665ec068e 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -80,7 +80,7 @@ class XenAPIVolumeTestCase(test.TestCase):
                   'image_id': 1,
                   'kernel_id': 2,
                   'ramdisk_id': 3,
-                  'instance_type': 'm1.large',
+                  'instance_type_id': '3',  # m1.large
                   'mac_address': 'aa:bb:cc:dd:ee:ff',
                   'os_type': 'linux'}
 
@@ -328,7 +328,7 @@ class XenAPIVMTestCase(test.TestCase):
         self.assertEquals(self.vm['HVM_boot_policy'], '')
 
     def _test_spawn(self, image_id, kernel_id, ramdisk_id,
-                    instance_type="m1.large", os_type="linux",
+                    instance_type_id="3", os_type="linux",
                     instance_id=1, check_injection=False):
         stubs.stubout_loopingcall_start(self.stubs)
         values = {'id': instance_id,
@@ -337,7 +337,7 @@ class XenAPIVMTestCase(test.TestCase):
                   'image_id': image_id,
                   'kernel_id': kernel_id,
                   'ramdisk_id': ramdisk_id,
-                  'instance_type': instance_type,
+                  'instance_type_id': instance_type_id,
                   'mac_address': 'aa:bb:cc:dd:ee:ff',
                   'os_type': os_type}
         instance = db.instance_create(self.context, values)
@@ -349,7 +349,7 @@ class XenAPIVMTestCase(test.TestCase):
         FLAGS.xenapi_image_service = 'glance'
         self.assertRaises(Exception,
                           self._test_spawn,
-                          1, 2, 3, "m1.xlarge")
+                          1, 2, 3, "4")  # m1.xlarge
 
     def test_spawn_raw_objectstore(self):
         FLAGS.xenapi_image_service = 'objectstore'
@@ -523,7 +523,7 @@ class XenAPIVMTestCase(test.TestCase):
             'image_id': 1,
             'kernel_id': 2,
             'ramdisk_id': 3,
-            'instance_type': 'm1.large',
+            'instance_type_id': '3',  # m1.large
             'mac_address': 'aa:bb:cc:dd:ee:ff',
             'os_type': 'linux'}
         instance = db.instance_create(self.context, values)
@@ -580,7 +580,7 @@ class XenAPIMigrateInstance(test.TestCase):
                   'kernel_id': None,
                   'ramdisk_id': None,
                   'local_gb': 5,
-                  'instance_type': 'm1.large',
+                  'instance_type_id': '3',  # m1.large
                   'mac_address': 'aa:bb:cc:dd:ee:ff',
                   'os_type': 'linux'}
 
-- 
cgit 


From 868288b9705ea765b5515fd0ac9e0858f37239d0 Mon Sep 17 00:00:00 2001
From: Ken Pepple <ken.pepple@gmail.com>
Date: Mon, 4 Apr 2011 16:07:39 -0700
Subject: correct test for numeric/string metadata value conversion

---
 nova/tests/api/openstack/test_servers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 313676e72..08a3f5d5a 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -630,7 +630,7 @@ class ServersTest(test.TestCase):
             self.assertEqual(s['imageId'], '10')
             self.assertEqual(s['flavorId'], '1')
             self.assertEqual(s['status'], 'BUILD')
-            self.assertEqual(s['metadata']['seq'], i)
+            self.assertEqual(s['metadata']['seq'], str(i))
 
     def test_get_all_server_details_v1_1(self):
         req = webob.Request.blank('/v1.1/servers/detail')
@@ -644,7 +644,7 @@ class ServersTest(test.TestCase):
             self.assertEqual(s['imageRef'], 'http://localhost/v1.1/images/10')
             self.assertEqual(s['flavorRef'], 'http://localhost/v1.1/flavors/1')
             self.assertEqual(s['status'], 'BUILD')
-            self.assertEqual(s['metadata']['seq'], i)
+            self.assertEqual(s['metadata']['seq'], str(i))
 
     def test_get_all_server_details_with_host(self):
         '''
-- 
cgit 


From 2b3aea4be35f370c68ac3c24ab15d4851aa28e94 Mon Sep 17 00:00:00 2001
From: Kei Masumoto <masumotok@nttdata.co.jp>
Date: Tue, 5 Apr 2011 20:10:10 +0900
Subject: fix bug 746821

---
 nova/tests/test_virt.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index 958c8e3e2..2e9eac0d5 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -479,7 +479,7 @@ class LibvirtConnTestCase(test.TestCase):
 
         fake_timer = FakeTime()
 
-        self.create_fake_libvirt_mock(nwfilterLookupByName=fake_raise)
+        self.create_fake_libvirt_mock()
         instance_ref = db.instance_create(self.context, self.test_instance)
 
         # Start test
@@ -488,6 +488,7 @@ class LibvirtConnTestCase(test.TestCase):
             conn = libvirt_conn.LibvirtConnection(False)
             conn.firewall_driver.setattr('setup_basic_filtering', fake_none)
             conn.firewall_driver.setattr('prepare_instance_filter', fake_none)
+            conn.firewall_driver.setattr('instance_filter_exists', fake_none)
             conn.ensure_filtering_rules_for_instance(instance_ref,
                                                      time=fake_timer)
         except exception.Error, e:
-- 
cgit 


From e6505fd78cc28a5e91ec6fbf55e2e8de07679c7c Mon Sep 17 00:00:00 2001
From: Naveed Massjouni <naveedm9@gmail.com>
Date: Tue, 5 Apr 2011 10:56:24 -0400
Subject: Fixed the addresses and metadata collections in xml responses. Added
 corresponding tests.

---
 nova/tests/api/openstack/test_servers.py | 36 ++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 313676e72..ce9821587 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -192,6 +192,26 @@ class ServersTest(test.TestCase):
         print res_dict['server']
         self.assertEqual(res_dict['server']['links'], expected_links)
 
+    def test_get_server_by_id_with_addresses_xml(self):
+        private = "192.168.0.3"
+        public = ["1.2.3.4"]
+        new_return_server = return_server_with_addresses(private, public)
+        self.stubs.Set(nova.db.api, 'instance_get', new_return_server)
+        req = webob.Request.blank('/v1.0/servers/1')
+        req.headers['Accept'] = 'application/xml'
+        res = req.get_response(fakes.wsgi_app())
+        dom = minidom.parseString(res.body)
+        server = dom.childNodes[0]
+        self.assertEquals(server.nodeName, 'server')
+        self.assertEquals(server.getAttribute('id'), '1')
+        self.assertEquals(server.getAttribute('name'), 'server1')
+        (public,) = server.getElementsByTagName('public');
+        (ip,) = public.getElementsByTagName('ip')
+        self.assertEquals(ip.getAttribute('addr'), '1.2.3.4')
+        (private,) = server.getElementsByTagName('private')
+        (ip,) = private.getElementsByTagName('ip')
+        self.assertEquals(ip.getAttribute('addr'),  '192.168.0.3')
+
     def test_get_server_by_id_with_addresses(self):
         private = "192.168.0.3"
         public = ["1.2.3.4"]
@@ -618,6 +638,22 @@ class ServersTest(test.TestCase):
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 404)
 
+    def test_get_all_server_details_xml_v1_0(self):
+        req = webob.Request.blank('/v1.0/servers/detail')
+        req.headers['Accept'] = 'application/xml'
+        res = req.get_response(fakes.wsgi_app())
+        print res.body
+        dom = minidom.parseString(res.body)
+        for i, server in enumerate(dom.getElementsByTagName('server')):
+            self.assertEqual(server.getAttribute('id'), str(i))
+            self.assertEqual(server.getAttribute('hostId'), '')
+            self.assertEqual(server.getAttribute('name'), 'server%d' % i)
+            self.assertEqual(server.getAttribute('imageId'), '10')
+            self.assertEqual(server.getAttribute('status'), 'BUILD')
+            (meta,) = server.getElementsByTagName('meta')
+            self.assertEqual(meta.getAttribute('key'), 'seq')
+            self.assertEqual(meta.firstChild.data.strip(), str(i))
+
     def test_get_all_server_details_v1_0(self):
         req = webob.Request.blank('/v1.0/servers/detail')
         res = req.get_response(fakes.wsgi_app())
-- 
cgit 


From a7a1f4dfda3751bb1f0f5c875e0799f1905259bd Mon Sep 17 00:00:00 2001
From: Mark Washenberger <mark.washenberger@rackspace.com>
Date: Tue, 5 Apr 2011 15:44:41 -0400
Subject: add tests for adminPass on server create

---
 nova/tests/api/openstack/test_servers.py | 46 ++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 313676e72..bd0bdf1b3 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -508,6 +508,52 @@ class ServersTest(test.TestCase):
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 400)
 
+    def test_create_instance_with_admin_pass_v10(self):
+        self._setup_for_create_instance()
+
+        body = {
+            'server': {
+                'name': 'test-server-create',
+                'imageId': 3,
+                'flavorId': 1,
+                'adminPass': 'testpass',
+            },
+        }
+
+        req = webob.Request.blank('/v1.0/servers')
+        req.method = 'POST'
+        req.body = json.dumps(body)
+        req.headers['content-type'] = "application/json"
+        res = req.get_response(fakes.wsgi_app())
+        res = json.loads(res.body)
+        self.assertNotEqual(res['server']['adminPass'],
+                            body['server']['adminPass'])
+
+    def test_create_instance_with_admin_pass_v11(self):
+        self._setup_for_create_instance()
+
+        imageRef = 'http://localhost/v1.1/images/2'
+        flavorRef = 'http://localhost/v1.1/flavors/3'
+        body = {
+            'server': {
+                'name': 'server_test',
+                'imageRef': imageRef,
+                'flavorRef': flavorRef,
+                'adminPass': 'testpass',
+            },
+        }
+
+        req = webob.Request.blank('/v1.1/servers')
+        req.method = 'POST'
+        req.body = json.dumps(body)
+        req.headers['content-type'] = "application/json"
+
+        res = req.get_response(fakes.wsgi_app())
+
+        server = json.loads(res.body)['server']
+        self.assertEqual(server['adminPass'], body['server']['adminPass'])
+
+
     def test_update_no_body(self):
         req = webob.Request.blank('/v1.0/servers/1')
         req.method = 'PUT'
-- 
cgit 


From b59f7e2b9ed0f08ac033cd839a6996a1931ccec6 Mon Sep 17 00:00:00 2001
From: Mark Washenberger <mark.washenberger@rackspace.com>
Date: Tue, 5 Apr 2011 16:30:30 -0400
Subject: refactor to handle invalid adminPass

---
 nova/tests/api/openstack/test_servers.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index bd0bdf1b3..65e6fee51 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -553,6 +553,26 @@ class ServersTest(test.TestCase):
         server = json.loads(res.body)['server']
         self.assertEqual(server['adminPass'], body['server']['adminPass'])
 
+    def test_create_instance_with_empty_admin_pass_v11(self):
+        self._setup_for_create_instance()
+
+        imageRef = 'http://localhost/v1.1/images/2'
+        flavorRef = 'http://localhost/v1.1/flavors/3'
+        body = {
+            'server': {
+                'name': 'server_test',
+                'imageRef': imageRef,
+                'flavorRef': flavorRef,
+                'adminPass': '',
+            },
+        }
+
+        req = webob.Request.blank('/v1.1/servers')
+        req.method = 'POST'
+        req.body = json.dumps(body)
+        req.headers['content-type'] = "application/json"
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 400)
 
     def test_update_no_body(self):
         req = webob.Request.blank('/v1.0/servers/1')
-- 
cgit 


From 1afcf5511d4cfa70dd17113c9253594fbd5b7aa1 Mon Sep 17 00:00:00 2001
From: Mark Washenberger <mark.washenberger@rackspace.com>
Date: Tue, 5 Apr 2011 16:53:59 -0400
Subject: remove extraneous empty lines

---
 nova/tests/api/openstack/test_servers.py | 2 --
 1 file changed, 2 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 65e6fee51..368343ce6 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -547,9 +547,7 @@ class ServersTest(test.TestCase):
         req.method = 'POST'
         req.body = json.dumps(body)
         req.headers['content-type'] = "application/json"
-
         res = req.get_response(fakes.wsgi_app())
-
         server = json.loads(res.body)['server']
         self.assertEqual(server['adminPass'], body['server']['adminPass'])
 
-- 
cgit 


From 3c487493de2a0f827780d54080797bfe70183ba6 Mon Sep 17 00:00:00 2001
From: Naveed Massjouni <naveedm9@gmail.com>
Date: Tue, 5 Apr 2011 17:49:38 -0400
Subject: Removing naughty semicolon.

---
 nova/tests/api/openstack/test_servers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index ce9821587..a424a8105 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -205,7 +205,7 @@ class ServersTest(test.TestCase):
         self.assertEquals(server.nodeName, 'server')
         self.assertEquals(server.getAttribute('id'), '1')
         self.assertEquals(server.getAttribute('name'), 'server1')
-        (public,) = server.getElementsByTagName('public');
+        (public,) = server.getElementsByTagName('public')
         (ip,) = public.getElementsByTagName('ip')
         self.assertEquals(ip.getAttribute('addr'), '1.2.3.4')
         (private,) = server.getElementsByTagName('private')
-- 
cgit 


From 8eff0a91bbc475d8559b39fb81e1a62beda841f3 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Tue, 5 Apr 2011 15:35:17 -0700
Subject: update and fix tests

---
 nova/tests/api/openstack/test_servers.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 313676e72..1ec01bb4c 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -1525,29 +1525,27 @@ class TestGetKernelRamdiskFromImage(test.TestCase):
 
     def test_not_ami(self):
         """Anything other than ami should return no kernel and no ramdisk"""
-        image_meta = {'id': 1, 'status': 'active',
-                      'properties': {'disk_format': 'vhd'}}
+        image_meta = {'id': 1, 'status': 'active', 'container_format': 'vhd'}
         kernel_id, ramdisk_id = self._get_k_r(image_meta)
         self.assertEqual(kernel_id, None)
         self.assertEqual(ramdisk_id, None)
 
     def test_ami_no_kernel(self):
         """If an ami is missing a kernel it should raise NotFound"""
-        image_meta = {'id': 1, 'status': 'active',
-                      'properties': {'disk_format': 'ami', 'ramdisk_id': 1}}
+        image_meta = {'id': 1, 'status': 'active', 'container_format': 'ami',
+                      'properties': {'ramdisk_id': 1}}
         self.assertRaises(exception.NotFound, self._get_k_r, image_meta)
 
     def test_ami_no_ramdisk(self):
         """If an ami is missing a ramdisk it should raise NotFound"""
-        image_meta = {'id': 1, 'status': 'active',
-                      'properties': {'disk_format': 'ami', 'kernel_id': 1}}
+        image_meta = {'id': 1, 'status': 'active', 'container_format': 'ami',
+                      'properties': {'kernel_id': 1}}
         self.assertRaises(exception.NotFound, self._get_k_r, image_meta)
 
     def test_ami_kernel_ramdisk_present(self):
         """Return IDs if both kernel and ramdisk are present"""
-        image_meta = {'id': 1, 'status': 'active',
-                      'properties': {'disk_format': 'ami', 'kernel_id': 1,
-                                     'ramdisk_id': 2}}
+        image_meta = {'id': 1, 'status': 'active', 'container_format': 'ami',
+                      'properties': {'kernel_id': 1, 'ramdisk_id': 2}}
         kernel_id, ramdisk_id = self._get_k_r(image_meta)
         self.assertEqual(kernel_id, 1)
         self.assertEqual(ramdisk_id, 2)
-- 
cgit 


From d5c077131e00f41a38fa03fdbea46aa4351f95b5 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Wed, 6 Apr 2011 13:05:39 -0500
Subject: updated check_vm_record in test_xenapi to check the gateway6
 correctly

---
 nova/tests/test_xenapi.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 17e3f55e9..42fe8f3fa 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -289,11 +289,11 @@ class XenAPIVMTestCase(test.TestCase):
                                         'enabled':'1'}],
                                 'ip6s': [{'ip': 'fe80::a8bb:ccff:fedd:eeff',
                                           'netmask': '120',
-                                          'enabled': '1',
-                                          'gateway': 'fe80::a00:1'}],
+                                          'enabled': '1'}],
                                 'mac': 'aa:bb:cc:dd:ee:ff',
                                 'dns': ['10.0.0.2'],
-                                'gateway': '10.0.0.1'})
+                                'gateway': '10.0.0.1',
+                                'gateway6': 'fe80::a00:1'})
 
     def check_vm_params_for_windows(self):
         self.assertEquals(self.vm['platform']['nx'], 'true')
-- 
cgit 


From 5534113f65cc578dcdf93432981b836bf4e3dfaf Mon Sep 17 00:00:00 2001
From: Naveed Massjouni <naveedm9@gmail.com>
Date: Wed, 6 Apr 2011 16:12:32 -0400
Subject: Added support for listing addresses of a server in the openstack api.
 Now you can GET  * /servers/1/ips  * /servers/1/ips/public  *
 /servers/1/ips/private Supports v1.0 json and xml. Added corresponding tests.

---
 nova/tests/api/openstack/test_servers.py | 78 ++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index a424a8105..640418cfa 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -228,6 +228,84 @@ class ServersTest(test.TestCase):
         self.assertEqual(len(addresses["private"]), 1)
         self.assertEqual(addresses["private"][0], private)
 
+    def test_get_server_addresses_V10(self):
+        private = '192.168.0.3'
+        public = ['1.2.3.4']
+        new_return_server = return_server_with_addresses(private, public)
+        self.stubs.Set(nova.db.api, 'instance_get', new_return_server)
+        req = webob.Request.blank('/v1.0/servers/1/ips')
+        res = req.get_response(fakes.wsgi_app())
+        res_dict = json.loads(res.body)
+        self.assertEqual(res_dict, {
+            'addresses': {'public': public, 'private': [private]}})
+
+    def test_get_server_addresses_xml_V10(self):
+        private_expected = "192.168.0.3"
+        public_expected = ["1.2.3.4"]
+        new_return_server = return_server_with_addresses(private_expected,
+                                                         public_expected)
+        self.stubs.Set(nova.db.api, 'instance_get', new_return_server)
+        req = webob.Request.blank('/v1.0/servers/1/ips')
+        req.headers['Accept'] = 'application/xml'
+        res = req.get_response(fakes.wsgi_app())
+        dom = minidom.parseString(res.body)
+        (addresses,) = dom.childNodes
+        self.assertEquals(addresses.nodeName, 'addresses')
+        (public,) = addresses.getElementsByTagName('public')
+        (ip,) = public.getElementsByTagName('ip')
+        self.assertEquals(ip.getAttribute('addr'), public_expected[0])
+        (private,) = addresses.getElementsByTagName('private')
+        (ip,) = private.getElementsByTagName('ip')
+        self.assertEquals(ip.getAttribute('addr'), private_expected)
+
+    def test_get_server_addresses_public_V10(self):
+        private = "192.168.0.3"
+        public = ["1.2.3.4"]
+        new_return_server = return_server_with_addresses(private, public)
+        self.stubs.Set(nova.db.api, 'instance_get', new_return_server)
+        req = webob.Request.blank('/v1.0/servers/1/ips/public')
+        res = req.get_response(fakes.wsgi_app())
+        res_dict = json.loads(res.body)
+        self.assertEqual(res_dict, {'public': public})
+
+    def test_get_server_addresses_private_V10(self):
+        private = "192.168.0.3"
+        public = ["1.2.3.4"]
+        new_return_server = return_server_with_addresses(private, public)
+        self.stubs.Set(nova.db.api, 'instance_get', new_return_server)
+        req = webob.Request.blank('/v1.0/servers/1/ips/private')
+        res = req.get_response(fakes.wsgi_app())
+        res_dict = json.loads(res.body)
+        self.assertEqual(res_dict, {'private': [private]})
+
+    def test_get_server_addresses_public_xml_V10(self):
+        private = "192.168.0.3"
+        public = ["1.2.3.4"]
+        new_return_server = return_server_with_addresses(private, public)
+        self.stubs.Set(nova.db.api, 'instance_get', new_return_server)
+        req = webob.Request.blank('/v1.0/servers/1/ips/public')
+        req.headers['Accept'] = 'application/xml'
+        res = req.get_response(fakes.wsgi_app())
+        dom = minidom.parseString(res.body)
+        (public_node,) = dom.childNodes
+        self.assertEquals(public_node.nodeName, 'public')
+        (ip,) = public_node.getElementsByTagName('ip')
+        self.assertEquals(ip.getAttribute('addr'), public[0])
+
+    def test_get_server_addresses_private_xml_V10(self):
+        private = "192.168.0.3"
+        public = ["1.2.3.4"]
+        new_return_server = return_server_with_addresses(private, public)
+        self.stubs.Set(nova.db.api, 'instance_get', new_return_server)
+        req = webob.Request.blank('/v1.0/servers/1/ips/private')
+        req.headers['Accept'] = 'application/xml'
+        res = req.get_response(fakes.wsgi_app())
+        dom = minidom.parseString(res.body)
+        (private_node,) = dom.childNodes
+        self.assertEquals(private_node.nodeName, 'private')
+        (ip,) = private_node.getElementsByTagName('ip')
+        self.assertEquals(ip.getAttribute('addr'), private)
+
     def test_get_server_by_id_with_addresses_v11(self):
         private = "192.168.0.3"
         public = ["1.2.3.4"]
-- 
cgit 


From 4c1c0b8357e2cffd5f9a2a1240439e1871f845f2 Mon Sep 17 00:00:00 2001
From: John Tran <jtran@attinteractive.com>
Date: Wed, 6 Apr 2011 19:43:58 -0700
Subject: add the tests

---
 nova/tests/test_exception.py | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 nova/tests/test_exception.py

(limited to 'nova/tests')

diff --git a/nova/tests/test_exception.py b/nova/tests/test_exception.py
new file mode 100644
index 000000000..65df20a61
--- /dev/null
+++ b/nova/tests/test_exception.py
@@ -0,0 +1,35 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from nova import test
+from nova import exception
+
+
+class ApiErrorTestCase(test.TestCase):
+
+    def test_return_valid_error(self):
+        # without 'code' arg
+        err = exception.ApiError('fake error')
+        self.assertEqual(err.__str__(), 'fake error')
+        self.assertEqual(err.code, None)
+        self.assertEqual(err.message, 'fake error')
+        # with 'code' arg
+        err = exception.ApiError('fake error', 'blah code')
+        self.assertEqual(err.__str__(), 'blah code: fake error')
+        self.assertEqual(err.code, 'blah code')
+        self.assertEqual(err.message, 'fake error')
-- 
cgit 


From 404feb59a829e24e026f793a362e54aad1aaa03f Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh@jk0.org>
Date: Thu, 7 Apr 2011 13:55:42 -0500
Subject: Renamed computeFault to cloudServersFault

---
 nova/tests/api/openstack/test_api.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_api.py b/nova/tests/api/openstack/test_api.py
index 5112c486f..c63431a45 100644
--- a/nova/tests/api/openstack/test_api.py
+++ b/nova/tests/api/openstack/test_api.py
@@ -53,13 +53,13 @@ class APITest(test.TestCase):
         #api.application = succeed
         api = self._wsgi_app(succeed)
         resp = Request.blank('/').get_response(api)
-        self.assertFalse('computeFault' in resp.body, resp.body)
+        self.assertFalse('cloudServersFault' in resp.body, resp.body)
         self.assertEqual(resp.status_int, 200, resp.body)
 
         #api.application = raise_webob_exc
         api = self._wsgi_app(raise_webob_exc)
         resp = Request.blank('/').get_response(api)
-        self.assertFalse('computeFault' in resp.body, resp.body)
+        self.assertFalse('cloudServersFault' in resp.body, resp.body)
         self.assertEqual(resp.status_int, 404, resp.body)
 
         #api.application = raise_api_fault
@@ -71,11 +71,11 @@ class APITest(test.TestCase):
         #api.application = fail
         api = self._wsgi_app(fail)
         resp = Request.blank('/').get_response(api)
-        self.assertTrue('{"computeFault' in resp.body, resp.body)
+        self.assertTrue('{"cloudServersFault' in resp.body, resp.body)
         self.assertEqual(resp.status_int, 500, resp.body)
 
         #api.application = fail
         api = self._wsgi_app(fail)
         resp = Request.blank('/.xml').get_response(api)
-        self.assertTrue('<computeFault' in resp.body, resp.body)
+        self.assertTrue('<cloudServersFault' in resp.body, resp.body)
         self.assertEqual(resp.status_int, 500, resp.body)
-- 
cgit 


From b0ad20c796bd25dad0538ab85b1a56f421e16039 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Thu, 7 Apr 2011 16:42:33 -0700
Subject: fix tests from moving access check into update and delete

---
 nova/tests/image/test_glance.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py
index 9d0b14613..109905ded 100644
--- a/nova/tests/image/test_glance.py
+++ b/nova/tests/image/test_glance.py
@@ -209,17 +209,17 @@ class TestMutatorDateTimeTests(BaseGlanceTest):
         self.assertDateTimesEmpty(image_meta)
 
     def test_update_handles_datetimes(self):
+        self.client.images = {'image1': self._make_datetime_fixture()}
         self.client.update_response = self._make_datetime_fixture()
-        dummy_id = 'dummy_id'
         dummy_meta = {}
-        image_meta = self.service.update(self.context, 'dummy_id', dummy_meta)
+        image_meta = self.service.update(self.context, 'image1', dummy_meta)
         self.assertDateTimesFilled(image_meta)
 
     def test_update_handles_none_datetimes(self):
+        self.client.images = {'image1': self._make_datetime_fixture()}
         self.client.update_response = self._make_none_datetime_fixture()
-        dummy_id = 'dummy_id'
         dummy_meta = {}
-        image_meta = self.service.update(self.context, 'dummy_id', dummy_meta)
+        image_meta = self.service.update(self.context, 'image1', dummy_meta)
         self.assertDateTimesEmpty(image_meta)
 
     def _make_datetime_fixture(self):
-- 
cgit 


From 7badb6c0278c8cc51fc3e870fd3810ea3706f494 Mon Sep 17 00:00:00 2001
From: Dan Prince <dan.prince@rackspace.com>
Date: Thu, 7 Apr 2011 23:39:29 -0400
Subject: Update the describe_image_attribute and modify_image_attribute
 functions in the ec2 API so they use the top level 'is_public' attribute of
 image objects. This brings these functions in line with the base image
 service.

Added missing EC2 unit tests on describing and modifying image attributes.
---
 nova/tests/test_cloud.py | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/test_cloud.py b/nova/tests/test_cloud.py
index 5cb969979..5f76a9005 100644
--- a/nova/tests/test_cloud.py
+++ b/nova/tests/test_cloud.py
@@ -247,6 +247,37 @@ class CloudTestCase(test.TestCase):
         self.assertRaises(NotFound, describe_images,
                           self.context, ['ami-fake'])
 
+    def test_describe_image_attribute(self):
+        describe_image_attribute = self.cloud.describe_image_attribute
+
+        def fake_show(meh, context, id):
+            return {'id': 1, 'properties': {'kernel_id': 1, 'ramdisk_id': 1,
+                    'type': 'machine'}, 'is_public': True}
+
+        self.stubs.Set(local.LocalImageService, 'show', fake_show)
+        self.stubs.Set(local.LocalImageService, 'show_by_name', fake_show)
+        result = describe_image_attribute(self.context, 'ami-00000001',
+                                          'launchPermission')
+        self.assertEqual([{'group': 'all'}], result['launchPermission'])
+
+    def test_modify_image_attribute(self):
+        modify_image_attribute = self.cloud.modify_image_attribute
+
+        def fake_show(meh, context, id):
+            return {'id': 1, 'properties': {'kernel_id': 1, 'ramdisk_id': 1,
+                    'type': 'machine'}, 'is_public': False}
+
+        def fake_update(meh, context, image_id, metadata, data=None):
+            return metadata
+
+        self.stubs.Set(local.LocalImageService, 'show', fake_show)
+        self.stubs.Set(local.LocalImageService, 'show_by_name', fake_show)
+        self.stubs.Set(local.LocalImageService, 'update', fake_update)
+        result = modify_image_attribute(self.context, 'ami-00000001',
+                                          'launchPermission', 'add',
+                                           user_group=['all'])
+        self.assertEqual(True, result['is_public'])
+
     def test_console_output(self):
         instance_type = FLAGS.default_instance_type
         max_count = 1
-- 
cgit 


From 3d72f59530b1c974dca498fbca44e5720547fc61 Mon Sep 17 00:00:00 2001
From: Ken Pepple <ken.pepple@gmail.com>
Date: Wed, 13 Apr 2011 11:51:03 -0700
Subject: fixed error message i18n-ization. added test.

---
 nova/tests/test_instance_types.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py
index 5d6d5e1f4..ec3bc5bbf 100644
--- a/nova/tests/test_instance_types.py
+++ b/nova/tests/test_instance_types.py
@@ -88,3 +88,13 @@ class InstanceTypeTestCase(test.TestCase):
         """Ensures that instance type creation fails with invalid args"""
         self.assertRaises(exception.ApiError,
                           instance_types.destroy, "sfsfsdfdfs")
+
+    def test_repeated_inst_types_should_raise_api_error(self):
+        """Ensures that instance duplicates raises ApiError"""
+        new_name = self.name + "dup"
+        instance_types.create(new_name, 256, 1, 120, self.flavorid + 1)
+        instance_types.destroy(new_name)
+        self.assertRaises(
+                exception.ApiError,
+                instance_types.create, new_name, 256, 1, 120, self.flavorid)
+        
\ No newline at end of file
-- 
cgit 


From 6a20cba0ea3c1e9945897ec27646d74d597492d7 Mon Sep 17 00:00:00 2001
From: Ken Pepple <ken.pepple@gmail.com>
Date: Wed, 13 Apr 2011 12:01:59 -0700
Subject: pep8

---
 nova/tests/test_instance_types.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py
index ec3bc5bbf..dd7d0737e 100644
--- a/nova/tests/test_instance_types.py
+++ b/nova/tests/test_instance_types.py
@@ -97,4 +97,3 @@ class InstanceTypeTestCase(test.TestCase):
         self.assertRaises(
                 exception.ApiError,
                 instance_types.create, new_name, 256, 1, 120, self.flavorid)
-        
\ No newline at end of file
-- 
cgit 


From ad138a5a50868531f34ba358600f1270588ce80b Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Fri, 15 Apr 2011 14:24:17 -0400
Subject: correcting tests; pep8

---
 nova/tests/test_scheduler.py | 69 ++++++++++++++------------------------------
 nova/tests/test_virt.py      |  2 +-
 2 files changed, 22 insertions(+), 49 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_scheduler.py b/nova/tests/test_scheduler.py
index ae56a1a16..4a2b15f56 100644
--- a/nova/tests/test_scheduler.py
+++ b/nova/tests/test_scheduler.py
@@ -698,14 +698,10 @@ class SimpleDriverTestCase(test.TestCase):
                'topic': 'volume', 'report_count': 0}
         s_ref = db.service_create(self.context, dic)
 
-        try:
-            self.scheduler.driver.schedule_live_migration(self.context,
-                                                          instance_id,
-                                                          i_ref['host'])
-        except exception.Invalid, e:
-            c = (e.message.find('volume node is not alive') >= 0)
+        self.assertRaises(exception.VolumeServiceUnavailable,
+                          self.scheduler.driver.schedule_live_migration,
+                          self.context, instance_id, i_ref['host'])
 
-        self.assertTrue(c)
         db.instance_destroy(self.context, instance_id)
         db.service_destroy(self.context, s_ref['id'])
         db.volume_destroy(self.context, v_ref['id'])
@@ -718,13 +714,10 @@ class SimpleDriverTestCase(test.TestCase):
         s_ref = self._create_compute_service(created_at=t, updated_at=t,
                                              host=i_ref['host'])
 
-        try:
-            self.scheduler.driver._live_migration_src_check(self.context,
-                                                            i_ref)
-        except exception.Invalid, e:
-            c = (e.message.find('is not alive') >= 0)
+        self.assertRaises(exception.ComputeServiceUnavailable,
+                          self.scheduler.driver._live_migration_src_check,
+                          self.context, i_ref)
 
-        self.assertTrue(c)
         db.instance_destroy(self.context, instance_id)
         db.service_destroy(self.context, s_ref['id'])
 
@@ -749,14 +742,10 @@ class SimpleDriverTestCase(test.TestCase):
         s_ref = self._create_compute_service(created_at=t, updated_at=t,
                                              host=i_ref['host'])
 
-        try:
-            self.scheduler.driver._live_migration_dest_check(self.context,
-                                                             i_ref,
-                                                             i_ref['host'])
-        except exception.Invalid, e:
-            c = (e.message.find('is not alive') >= 0)
+        self.assertRaises(exception.ComputeServiceUnavailable,
+                          self.scheduler.driver._live_migration_dest_check,
+                          self.context, i_ref, i_ref['host'])
 
-        self.assertTrue(c)
         db.instance_destroy(self.context, instance_id)
         db.service_destroy(self.context, s_ref['id'])
 
@@ -766,14 +755,10 @@ class SimpleDriverTestCase(test.TestCase):
         i_ref = db.instance_get(self.context, instance_id)
         s_ref = self._create_compute_service(host=i_ref['host'])
 
-        try:
-            self.scheduler.driver._live_migration_dest_check(self.context,
-                                                             i_ref,
-                                                             i_ref['host'])
-        except exception.Invalid, e:
-            c = (e.message.find('choose other host') >= 0)
+        self.assertRaises(exception.UnableToMigrateToSelf,
+                          self.scheduler.driver._live_migration_dest_check,
+                          self.context, i_ref, i_ref['host'])
 
-        self.assertTrue(c)
         db.instance_destroy(self.context, instance_id)
         db.service_destroy(self.context, s_ref['id'])
 
@@ -837,14 +822,10 @@ class SimpleDriverTestCase(test.TestCase):
              "args": {'filename': fpath}})
 
         self.mox.ReplayAll()
-        try:
-            self.scheduler.driver._live_migration_common_check(self.context,
-                                                               i_ref,
-                                                               dest)
-        except exception.Invalid, e:
-            c = (e.message.find('does not exist') >= 0)
+        self.assertRaises(exception.SourceHostUnavailable,
+                          self.scheduler.driver._live_migration_common_check,
+                          self.context, i_ref, dest)
 
-        self.assertTrue(c)
         db.instance_destroy(self.context, instance_id)
         db.service_destroy(self.context, s_ref['id'])
 
@@ -865,14 +846,10 @@ class SimpleDriverTestCase(test.TestCase):
         driver.mounted_on_same_shared_storage(mox.IgnoreArg(), i_ref, dest)
 
         self.mox.ReplayAll()
-        try:
-            self.scheduler.driver._live_migration_common_check(self.context,
-                                                               i_ref,
-                                                               dest)
-        except exception.Invalid, e:
-            c = (e.message.find(_('Different hypervisor type')) >= 0)
+        self.assertRaises(exception.InvalidHypervisorType,
+                          self.scheduler.driver._live_migration_common_check,
+                          self.context, i_ref, dest)
 
-        self.assertTrue(c)
         db.instance_destroy(self.context, instance_id)
         db.service_destroy(self.context, s_ref['id'])
         db.service_destroy(self.context, s_ref2['id'])
@@ -895,14 +872,10 @@ class SimpleDriverTestCase(test.TestCase):
         driver.mounted_on_same_shared_storage(mox.IgnoreArg(), i_ref, dest)
 
         self.mox.ReplayAll()
-        try:
-            self.scheduler.driver._live_migration_common_check(self.context,
-                                                               i_ref,
-                                                               dest)
-        except exception.Invalid, e:
-            c = (e.message.find(_('Older hypervisor version')) >= 0)
+        self.assertRaises(exception.DestinationHypervisorTooOld,
+                          self.scheduler.driver._live_migration_common_check,
+                          self.context, i_ref, dest)
 
-        self.assertTrue(c)
         db.instance_destroy(self.context, instance_id)
         db.service_destroy(self.context, s_ref['id'])
         db.service_destroy(self.context, s_ref2['id'])
diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index aeaea91c7..fe0ea5d6e 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -451,7 +451,7 @@ class LibvirtConnTestCase(test.TestCase):
 
         self.mox.ReplayAll()
         conn = libvirt_conn.LibvirtConnection(False)
-        self.assertRaises(exception.Invalid,
+        self.assertRaises(exception.ComputeServiceUnavailable,
                           conn.update_available_resource,
                           self.context, 'dummy')
 
-- 
cgit 


From 7080cbe4d5d3e963dac21a51cb7e9819ec03a27b Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Fri, 15 Apr 2011 15:36:52 -0400
Subject: Added period to docstring for metadata test.

---
 nova/tests/integrated/test_servers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/tests')

diff --git a/nova/tests/integrated/test_servers.py b/nova/tests/integrated/test_servers.py
index 8175659a3..e89d0100a 100644
--- a/nova/tests/integrated/test_servers.py
+++ b/nova/tests/integrated/test_servers.py
@@ -135,7 +135,7 @@ class ServersTest(integrated_helpers._IntegratedTestBase):
         self.assertFalse(found_server)
 
     def test_create_server_with_metadata(self):
-        """Creates a server with metadata"""
+        """Creates a server with metadata."""
 
         # Build the server data gradually, checking errors along the way
         server = self._build_minimal_create_server_request()
-- 
cgit 


From eb20dd53832577f94f5f251bd97e866435f6aeb9 Mon Sep 17 00:00:00 2001
From: Jason Koelker <jason@koelker.net>
Date: Mon, 18 Apr 2011 15:40:16 -0500
Subject: Change '== None' to 'is None'

---
 nova/tests/api/openstack/test_servers.py | 2 +-
 nova/tests/test_scheduler.py             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 34513734b..9d3352a1c 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -79,7 +79,7 @@ def stub_instance(id, user_id=1, private_address=None, public_addresses=None,
 
     inst_type = instance_types.get_instance_type_by_flavor_id(1)
 
-    if public_addresses == None:
+    if public_addresses is None:
         public_addresses = list()
 
     if host != None:
diff --git a/nova/tests/test_scheduler.py b/nova/tests/test_scheduler.py
index ae56a1a16..51d987288 100644
--- a/nova/tests/test_scheduler.py
+++ b/nova/tests/test_scheduler.py
@@ -737,7 +737,7 @@ class SimpleDriverTestCase(test.TestCase):
         ret = self.scheduler.driver._live_migration_src_check(self.context,
                                                               i_ref)
 
-        self.assertTrue(ret == None)
+        self.assertTrue(ret is None)
         db.instance_destroy(self.context, instance_id)
         db.service_destroy(self.context, s_ref['id'])
 
@@ -805,7 +805,7 @@ class SimpleDriverTestCase(test.TestCase):
         ret = self.scheduler.driver._live_migration_dest_check(self.context,
                                                              i_ref,
                                                              'somewhere')
-        self.assertTrue(ret == None)
+        self.assertTrue(ret is None)
         db.instance_destroy(self.context, instance_id)
         db.service_destroy(self.context, s_ref['id'])
 
-- 
cgit 


From 65ca5ba31f2c5ecea05290390ad66e65543aa83d Mon Sep 17 00:00:00 2001
From: Jason Koelker <jason@koelker.net>
Date: Mon, 18 Apr 2011 15:49:06 -0500
Subject: pep8 fixes

---
 nova/tests/api/openstack/test_image_metadata.py  | 6 ++----
 nova/tests/api/openstack/test_server_metadata.py | 3 +--
 nova/tests/api/openstack/test_versions.py        | 6 ++----
 3 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_image_metadata.py b/nova/tests/api/openstack/test_image_metadata.py
index 543c59629..56be0f1cc 100644
--- a/nova/tests/api/openstack/test_image_metadata.py
+++ b/nova/tests/api/openstack/test_image_metadata.py
@@ -46,8 +46,7 @@ class ImageMetaDataTest(unittest.TestCase):
         'deleted_at': None,
         'properties': {
             'key1': 'value1',
-            'key2': 'value2'
-        },
+            'key2': 'value2'},
         'size': 5882349},
         {'status': 'active',
         'name': 'image2',
@@ -62,8 +61,7 @@ class ImageMetaDataTest(unittest.TestCase):
         'deleted_at': None,
         'properties': {
             'key1': 'value1',
-            'key2': 'value2'
-        },
+            'key2': 'value2'},
         'size': 5882349},
         {'status': 'active',
         'name': 'image3',
diff --git a/nova/tests/api/openstack/test_server_metadata.py b/nova/tests/api/openstack/test_server_metadata.py
index c8d456472..680ff3e2c 100644
--- a/nova/tests/api/openstack/test_server_metadata.py
+++ b/nova/tests/api/openstack/test_server_metadata.py
@@ -48,8 +48,7 @@ def stub_server_metadata():
             "key2": "value2",
             "key3": "value3",
             "key4": "value4",
-            "key5": "value5"
-        }
+            "key5": "value5"}
     return metadata
 
 
diff --git a/nova/tests/api/openstack/test_versions.py b/nova/tests/api/openstack/test_versions.py
index 2640a4ddb..fd8d50904 100644
--- a/nova/tests/api/openstack/test_versions.py
+++ b/nova/tests/api/openstack/test_versions.py
@@ -47,8 +47,7 @@ class VersionsTest(test.TestCase):
                     {
                         "rel": "self",
                         "href": "http://localhost/v1.1",
-                    }
-                ],
+                    }],
             },
             {
                 "id": "v1.0",
@@ -57,8 +56,7 @@ class VersionsTest(test.TestCase):
                     {
                         "rel": "self",
                         "href": "http://localhost/v1.0",
-                    }
-                ],
+                    }],
             },
         ]
         self.assertEqual(versions, expected)
-- 
cgit 


From f59f792c83c7f18e48903165df8d3dd78f45dd4c Mon Sep 17 00:00:00 2001
From: Jason Koelker <jason@koelker.net>
Date: Mon, 18 Apr 2011 15:53:09 -0500
Subject: use 'is not None' instead of '!= None'

---
 nova/tests/api/openstack/test_servers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 34513734b..d7525fca0 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -82,7 +82,7 @@ def stub_instance(id, user_id=1, private_address=None, public_addresses=None,
     if public_addresses == None:
         public_addresses = list()
 
-    if host != None:
+    if host is not None:
         host = str(host)
 
     instance = {
-- 
cgit 


From 9c6cbd448088f5096bba9866d8057300256c6d34 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Tue, 19 Apr 2011 09:48:07 -0400
Subject: moving dynamic i18n to static

---
 nova/tests/test_localization.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nova/tests')

diff --git a/nova/tests/test_localization.py b/nova/tests/test_localization.py
index a25809a79..37cc22b1d 100644
--- a/nova/tests/test_localization.py
+++ b/nova/tests/test_localization.py
@@ -59,6 +59,7 @@ class LocalizationTestCase(test.TestCase):
                     pos = 0
                     while parenCount > 0:
                         char = txt[pos]
+                        print char
                         if char == "(":
                             parenCount += 1
                         elif char == ")":
-- 
cgit 


From 4466f775a70162f8a140afbe19a56d7290b014d3 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Tue, 19 Apr 2011 09:48:44 -0400
Subject: removing rogue print

---
 nova/tests/test_localization.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_localization.py b/nova/tests/test_localization.py
index 37cc22b1d..a25809a79 100644
--- a/nova/tests/test_localization.py
+++ b/nova/tests/test_localization.py
@@ -59,7 +59,6 @@ class LocalizationTestCase(test.TestCase):
                     pos = 0
                     while parenCount > 0:
                         char = txt[pos]
-                        print char
                         if char == "(":
                             parenCount += 1
                         elif char == ")":
-- 
cgit 


From 41966e6475db5da505947b816670797c0cede029 Mon Sep 17 00:00:00 2001
From: Jason Kölker <jason@koelker.net>
Date: Tue, 19 Apr 2011 15:52:32 -0500
Subject: add support for git checking and a default of failing if the history
 can't be read

---
 nova/tests/test_misc.py | 49 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 17 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_misc.py b/nova/tests/test_misc.py
index 4e17e1ce0..ad62b48bf 100644
--- a/nova/tests/test_misc.py
+++ b/nova/tests/test_misc.py
@@ -29,11 +29,12 @@ from nova.utils import parse_mailmap, str_dict_replace
 class ProjectTestCase(test.TestCase):
     def test_authors_up_to_date(self):
         topdir = os.path.normpath(os.path.dirname(__file__) + '/../../')
-        if os.path.exists(os.path.join(topdir, '.bzr')):
-            contributors = set()
-
-            mailmap = parse_mailmap(os.path.join(topdir, '.mailmap'))
+        missing = set()
+        contributors = set()
+        mailmap = parse_mailmap(os.path.join(topdir, '.mailmap'))
+        authors_file = open(os.path.join(topdir, 'Authors'), 'r').read()
 
+        if os.path.exists(os.path.join(topdir, '.bzr')):
             import bzrlib.workingtree
             tree = bzrlib.workingtree.WorkingTree.open(topdir)
             tree.lock_read()
@@ -47,22 +48,36 @@ class ProjectTestCase(test.TestCase):
                     for r in revs:
                         for author in r.get_apparent_authors():
                             email = author.split(' ')[-1]
-                            contributors.add(str_dict_replace(email, mailmap))
+                            contributors.add(str_dict_replace(email,
+                                                              mailmap))
+            finally:
+                tree.unlock()
 
-                authors_file = open(os.path.join(topdir, 'Authors'),
-                                    'r').read()
+        elif os.path.exists(os.path.join(topdir, '.git')):
+            import git
+            repo = git.Repo(topdir)
+            for commit in repo.head.commit.iter_parents():
+                email = commit.author.email
+                if email is None:
+                    email = commit.author.name
+                if 'nova-core' in email:
+                    continue
+                if email.split(' ')[-1] == '<>':
+                    email = email.split(' ')[-2]
+                email = '<' + email + '>'
+                contributors.add(str_dict_replace(email, mailmap))
 
-                missing = set()
-                for contributor in contributors:
-                    if contributor == 'nova-core':
-                        continue
-                    if not contributor in authors_file:
-                        missing.add(contributor)
+        else:
+            self.assertTrue(False, 'Cannot read commit history')
 
-                self.assertTrue(len(missing) == 0,
-                                '%r not listed in Authors' % missing)
-            finally:
-                tree.unlock()
+        for contributor in contributors:
+            if contributor == 'nova-core':
+                continue
+            if not contributor in authors_file:
+                missing.add(contributor)
+
+        self.assertTrue(len(missing) == 0,
+                        '%r not listed in Authors' % missing)
 
 
 class LockTestCase(test.TestCase):
-- 
cgit 


From 803d246c35256e0578837226b1a91003e451ab6f Mon Sep 17 00:00:00 2001
From: Ilya Alekseyev <ialekseev@griddynamics.com>
Date: Wed, 20 Apr 2011 18:35:07 +0400
Subject: instance type get approach changed. tests fixed

---
 nova/tests/test_virt.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index 5c8705a1c..0a0c7a958 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -619,7 +619,7 @@ class IptablesFirewallTestCase(test.TestCase):
                                           {'user_id': 'fake',
                                           'project_id': 'fake',
                                           'mac_address': '56:12:12:12:12:12',
-                                          'instance_type': 'm1.small'})
+                                          'instance_type_id': 1})
         ip = '10.11.12.13'
 
         network_ref = db.project_get_network(self.context,
@@ -843,7 +843,7 @@ class NWFilterTestCase(test.TestCase):
                                           {'user_id': 'fake',
                                           'project_id': 'fake',
                                           'mac_address': '00:A0:C9:14:C8:29',
-                                          'instance_type': 'm1.small'})
+                                          'instance_type_id': 1})
         inst_id = instance_ref['id']
 
         ip = '10.11.12.13'
-- 
cgit 


From 48936f6b8f063cf71fa42b4586d8ba524ed39cc4 Mon Sep 17 00:00:00 2001
From: Eldar Nugaev <enugaev@griddynamics.com>
Date: Wed, 20 Apr 2011 20:37:51 +0400
Subject: fix Request.get_content_type

---
 nova/tests/api/openstack/test_extensions.py | 1 +
 nova/tests/api/openstack/test_servers.py    | 4 ++++
 nova/tests/api/test_wsgi.py                 | 7 +++++++
 3 files changed, 12 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_extensions.py b/nova/tests/api/openstack/test_extensions.py
index 481d34ed1..6453e96c9 100644
--- a/nova/tests/api/openstack/test_extensions.py
+++ b/nova/tests/api/openstack/test_extensions.py
@@ -158,6 +158,7 @@ class ActionExtensionTest(unittest.TestCase):
         request.method = 'POST'
         request.content_type = 'application/json'
         request.body = json.dumps(body)
+        request.environ = {'nova.context': 'context'}
         response = request.get_response(ext_midware)
         return response
 
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 556046e9d..a92da52b1 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -952,6 +952,7 @@ class ServersTest(test.TestCase):
         req.method = 'POST'
         req.content_type = 'application/json'
         req.body = json.dumps(body)
+        req.environ = {"nova.context": "context"}
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 501)
 
@@ -973,6 +974,7 @@ class ServersTest(test.TestCase):
         req.method = 'POST'
         req.content_type = 'application/json'
         req.body = json.dumps(body)
+        req.environ = {"nova.context": "context"}
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 202)
         self.assertEqual(mock_method.instance_id, '1')
@@ -993,6 +995,7 @@ class ServersTest(test.TestCase):
         req.method = 'POST'
         req.content_type = 'application/json'
         req.body = json.dumps(body)
+        req.environ = {"nova.context": "context"}
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 400)
 
@@ -1002,6 +1005,7 @@ class ServersTest(test.TestCase):
         req.method = 'POST'
         req.content_type = 'application/json'
         req.body = json.dumps(body)
+        req.environ = {"nova.context": "context"}
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 400)
 
diff --git a/nova/tests/api/test_wsgi.py b/nova/tests/api/test_wsgi.py
index 1ecdd1cfb..ed96aac5e 100644
--- a/nova/tests/api/test_wsgi.py
+++ b/nova/tests/api/test_wsgi.py
@@ -136,6 +136,13 @@ class RequestTest(test.TestCase):
         request.body = "asdf<br />"
         self.assertRaises(webob.exc.HTTPBadRequest, request.get_content_type)
 
+    def test_request_content_type_with_charset(self):
+        request = wsgi.Request.blank('/tests/123')
+        request.headers["Content-Type"] = "application/json; charset=UTF-8"
+        request.body = "<body />"
+        result = request.get_content_type()
+        self.assertEqual(result, "application/json")
+
     def test_content_type_from_accept_xml(self):
         request = wsgi.Request.blank('/tests/123')
         request.headers["Accept"] = "application/xml"
-- 
cgit 


From a4b78306d31e1ef84d5dc9550ef2dcb1ed030fa2 Mon Sep 17 00:00:00 2001
From: Eldar Nugaev <enugaev@griddynamics.com>
Date: Wed, 20 Apr 2011 21:34:55 +0400
Subject: fix after review: style, improving tests, replacing underscore

---
 nova/tests/test_virt.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index 19e4d5428..2e6fae6c7 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -223,7 +223,7 @@ class LibvirtConnTestCase(test.TestCase):
                                         _create_network_info(2))
         self.assertTrue(len(result['nics']) == 2)
 
-    def test_get_nic_for_xml(self):
+    def test_get_nic_for_xml_v4(self):
         conn = libvirt_conn.LibvirtConnection(True)
         network, mapping = _create_network_info()[0]
         self.flags(use_ipv6=False)
@@ -794,8 +794,11 @@ class IptablesFirewallTestCase(test.TestCase):
         self.assertEquals(len(rulesv6), 3)
 
     def multinic_iptables_test(self):
+        ipv4_rules_per_network = 2
+        ipv6_rules_per_network = 3
+        networks_count = 5
         instance_ref = self._create_instance_ref()
-        network_info = _create_network_info()
+        network_info = _create_network_info(networks_count)
         ipv4_len = len(self.fw.iptables.ipv4['filter'].rules)
         ipv6_len = len(self.fw.iptables.ipv6['filter'].rules)
         inst_ipv4, inst_ipv6 = self.fw.instance_rules(instance_ref,
@@ -803,8 +806,12 @@ class IptablesFirewallTestCase(test.TestCase):
         self.fw.add_filters_for_instance(instance_ref, network_info)
         ipv4 = self.fw.iptables.ipv4['filter'].rules
         ipv6 = self.fw.iptables.ipv6['filter'].rules
-        self.assertEquals(len(ipv4) - len(inst_ipv4) - ipv4_len, 2)
-        self.assertEquals(len(ipv6) - len(inst_ipv6) - ipv6_len, 3)
+        ipv4_network_rules = len(ipv4) - len(inst_ipv4) - ipv4_len
+        ipv6_network_rules = len(ipv6) - len(inst_ipv6) - ipv6_len
+        self.assertEquals(ipv4_network_rules,
+                          ipv4_rules_per_network * networks_count)
+        self.assertEquals(ipv6_network_rules,
+                          ipv6_rules_per_network * networks_count)
 
 
 class NWFilterTestCase(test.TestCase):
@@ -965,6 +972,7 @@ class NWFilterTestCase(test.TestCase):
     def test_create_network_filters(self):
         instance_ref = self._create_instance()
         network_info = _create_network_info(3)
-        result = \
-        self.fw._create_network_filters(instance_ref, network_info, "fake")
+        result = self.fw._create_network_filters(instance_ref,
+                                                 network_info,
+                                                 "fake")
         self.assertEquals(len(result), 3)
-- 
cgit 


From fe23f71687e09248feb7542ea97001a496697742 Mon Sep 17 00:00:00 2001
From: Eldar Nugaev <enugaev@griddynamics.com>
Date: Wed, 20 Apr 2011 22:01:14 +0400
Subject: remove ambiguity in test

---
 nova/tests/api/test_wsgi.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/test_wsgi.py b/nova/tests/api/test_wsgi.py
index ed96aac5e..5820ecdc2 100644
--- a/nova/tests/api/test_wsgi.py
+++ b/nova/tests/api/test_wsgi.py
@@ -139,7 +139,6 @@ class RequestTest(test.TestCase):
     def test_request_content_type_with_charset(self):
         request = wsgi.Request.blank('/tests/123')
         request.headers["Content-Type"] = "application/json; charset=UTF-8"
-        request.body = "<body />"
         result = request.get_content_type()
         self.assertEqual(result, "application/json")
 
-- 
cgit 


From db1f6a3f2a8d85c82eb3530194e61276e7f54c6a Mon Sep 17 00:00:00 2001
From: Yoshiaki Tamura <yoshi@midokura.jp>
Date: Thu, 21 Apr 2011 16:54:37 +0900
Subject: Add a test checking spawn() works when network_info is set, which
 currently doesn't. The following patch would fix it.

---
 nova/tests/test_virt.py | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index aeaea91c7..fdde6ed97 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -549,6 +549,43 @@ class LibvirtConnTestCase(test.TestCase):
         db.volume_destroy(self.context, volume_ref['id'])
         db.instance_destroy(self.context, instance_ref['id'])
 
+    def test_spawn_with_network_info(self):
+        # Skip if non-libvirt environment
+        if not self.lazy_load_library_exists():
+            return
+
+        # Preparing mocks
+        def fake_none(self, instance):
+            return
+
+        self.create_fake_libvirt_mock()
+        instance = db.instance_create(self.context, self.test_instance)
+
+        # Start test
+        self.mox.ReplayAll()
+        conn = libvirt_conn.LibvirtConnection(False)
+        conn.firewall_driver.setattr('setup_basic_filtering', fake_none)
+        conn.firewall_driver.setattr('prepare_instance_filter', fake_none)
+
+        network = db.project_get_network(context.get_admin_context(),
+                                         self.project.id)
+        ip_dict = {'ip': self.test_ip,
+                   'netmask': network['netmask'],
+                   'enabled': '1'}
+        mapping = {'label': network['label'],
+                   'gateway': network['gateway'],
+                   'mac': instance['mac_address'],
+                   'dns': [network['dns']],
+                   'ips': [ip_dict]}
+        network_info = [(network, mapping)]
+
+        try:
+            conn.spawn(instance, network_info)
+        except Exception, e:
+            count = (0 <= e.message.find('Unexpected method call'))
+
+        self.assertTrue(count)
+
     def tearDown(self):
         self.manager.delete_project(self.project)
         self.manager.delete_user(self.user)
-- 
cgit 


From 9cb5c0113d67a306a6c85ed6f6fd7f353cc95c7c Mon Sep 17 00:00:00 2001
From: Alex Meade <alex.meade@rackspace.com>
Date: Thu, 21 Apr 2011 14:12:54 -0400
Subject: Modified instance status for shutdown power state in OS api

---
 nova/tests/api/openstack/test_servers.py | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 556046e9d..c34392764 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -33,6 +33,7 @@ import nova.api.openstack
 from nova.api.openstack import servers
 import nova.compute.api
 from nova.compute import instance_types
+from nova.compute import power_state
 import nova.db.api
 from nova.db.sqlalchemy.models import Instance
 from nova.db.sqlalchemy.models import InstanceMetadata
@@ -56,6 +57,12 @@ def return_server_with_addresses(private, public):
     return _return_server
 
 
+def return_server_with_power_state(power_state):
+    def _return_server(context, id):
+        return stub_instance(id, power_state=power_state)
+    return _return_server
+
+
 def return_servers(context, user_id=1):
     return [stub_instance(i, user_id) for i in xrange(5)]
 
@@ -73,7 +80,7 @@ def instance_address(context, instance_id):
 
 
 def stub_instance(id, user_id=1, private_address=None, public_addresses=None,
-                  host=None):
+                  host=None, power_state=0):
     metadata = []
     metadata.append(InstanceMetadata(key='seq', value=id))
 
@@ -96,7 +103,7 @@ def stub_instance(id, user_id=1, private_address=None, public_addresses=None,
         "launch_index": 0,
         "key_name": "",
         "key_data": "",
-        "state": 0,
+        "state": power_state,
         "state_description": "",
         "memory_mb": 0,
         "vcpus": 0,
@@ -1155,6 +1162,15 @@ class ServersTest(test.TestCase):
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 400)
 
+    def test_shutdown_status(self): 
+        new_return_server = return_server_with_power_state(power_state.SHUTDOWN)
+        self.stubs.Set(nova.db.api, 'instance_get', new_return_server)
+        req = webob.Request.blank('/v1.0/servers/1')
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 200)
+        res_dict = json.loads(res.body)
+        self.assertEqual(res_dict['server']['status'], 'INACTIVE')
+        
 
 class TestServerCreateRequestXMLDeserializer(unittest.TestCase):
 
-- 
cgit 


From 8681db3aa9104f97a84a3323b102ed10af269888 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Thu, 21 Apr 2011 15:50:04 -0400
Subject: Addressing exception.NotFound across the project

---
 nova/tests/api/openstack/test_flavors.py |  4 ++--
 nova/tests/test_scheduler.py             | 20 ++++++++------------
 nova/tests/test_volume.py                |  2 +-
 3 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_flavors.py b/nova/tests/api/openstack/test_flavors.py
index 954d72adf..d1c62e454 100644
--- a/nova/tests/api/openstack/test_flavors.py
+++ b/nova/tests/api/openstack/test_flavors.py
@@ -47,8 +47,8 @@ def return_instance_types(context, num=2):
     return instance_types
 
 
-def return_instance_type_not_found(context, flavorid):
-    raise exception.NotFound()
+def return_instance_type_not_found(context, flavor_id):
+    raise exception.InstanceTypeNotFound(flavor_id=flavor_id)
 
 
 class FlavorsTest(test.TestCase):
diff --git a/nova/tests/test_scheduler.py b/nova/tests/test_scheduler.py
index 42ea19d6e..efd12f930 100644
--- a/nova/tests/test_scheduler.py
+++ b/nova/tests/test_scheduler.py
@@ -120,12 +120,11 @@ class SchedulerTestCase(test.TestCase):
         dest = 'dummydest'
         ctxt = context.get_admin_context()
 
-        try:
-            scheduler.show_host_resources(ctxt, dest)
-        except exception.NotFound, e:
-            c1 = (e.message.find(_("does not exist or is not a "
-                                   "compute node.")) >= 0)
-        self.assertTrue(c1)
+        self.assertRaises(exception.NotFound, scheduler.show_host_resources,
+                          ctxt, dest)
+        #TODO(bcwaldon): reimplement this functionality
+        #c1 = (e.message.find(_("does not exist or is not a "
+        #                       "compute node.")) >= 0)
 
     def _dic_is_equal(self, dic1, dic2, keys=None):
         """Compares 2 dictionary contents(Helper method)"""
@@ -941,7 +940,7 @@ class FakeRerouteCompute(api.reroute_compute):
 
 
 def go_boom(self, context, instance):
-    raise exception.InstanceNotFound("boom message", instance)
+    raise exception.InstanceNotFound(instance_id=instance)
 
 
 def found_instance(self, context, instance):
@@ -990,11 +989,8 @@ class ZoneRedirectTest(test.TestCase):
     def test_routing_flags(self):
         FLAGS.enable_zone_routing = False
         decorator = FakeRerouteCompute("foo")
-        try:
-            result = decorator(go_boom)(None, None, 1)
-            self.assertFail(_("Should have thrown exception."))
-        except exception.InstanceNotFound, e:
-            self.assertEquals(e.message, 'boom message')
+        self.assertRaises(exception.InstanceNotFound, decorator(go_boom),
+                          None, None, 1)
 
     def test_get_collection_context_and_id(self):
         decorator = api.reroute_compute("foo")
diff --git a/nova/tests/test_volume.py b/nova/tests/test_volume.py
index e9d8289aa..236d12434 100644
--- a/nova/tests/test_volume.py
+++ b/nova/tests/test_volume.py
@@ -142,7 +142,7 @@ class VolumeTestCase(test.TestCase):
         self.assertEqual(vol['status'], "available")
 
         self.volume.delete_volume(self.context, volume_id)
-        self.assertRaises(exception.Error,
+        self.assertRaises(exception.VolumeNotFound,
                           db.volume_get,
                           self.context,
                           volume_id)
-- 
cgit 


From c3ab4f023e2636e254f940e08da0aded42c0e96b Mon Sep 17 00:00:00 2001
From: John Tran <jtran@attinteractive.com>
Date: Mon, 25 Apr 2011 12:55:59 -0400
Subject: removed extra newline

---
 nova/tests/test_exception.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_exception.py b/nova/tests/test_exception.py
index 65df20a61..1b0e41d9a 100644
--- a/nova/tests/test_exception.py
+++ b/nova/tests/test_exception.py
@@ -21,7 +21,6 @@ from nova import exception
 
 
 class ApiErrorTestCase(test.TestCase):
-
     def test_return_valid_error(self):
         # without 'code' arg
         err = exception.ApiError('fake error')
-- 
cgit 


From 6721d8918820f53288cbdf09ee352e93120439f9 Mon Sep 17 00:00:00 2001
From: Alex Meade <alex.meade@rackspace.com>
Date: Tue, 26 Apr 2011 09:45:53 -0400
Subject: Modified instance status for shutoff power state in OS api

---
 nova/tests/api/openstack/test_servers.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index c34392764..f651bb258 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -1169,7 +1169,16 @@ class ServersTest(test.TestCase):
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 200)
         res_dict = json.loads(res.body)
-        self.assertEqual(res_dict['server']['status'], 'INACTIVE')
+        self.assertEqual(res_dict['server']['status'], 'SHUTDOWN')
+        
+    def test_shutoff_status(self): 
+        new_return_server = return_server_with_power_state(power_state.SHUTOFF)
+        self.stubs.Set(nova.db.api, 'instance_get', new_return_server)
+        req = webob.Request.blank('/v1.0/servers/1')
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 200)
+        res_dict = json.loads(res.body)
+        self.assertEqual(res_dict['server']['status'], 'SHUTOFF')
         
 
 class TestServerCreateRequestXMLDeserializer(unittest.TestCase):
-- 
cgit 


From 7630ae42c0e5ba0b7cb2c1cb10b9019215c36570 Mon Sep 17 00:00:00 2001
From: Alex Meade <alex.meade@rackspace.com>
Date: Tue, 26 Apr 2011 11:25:02 -0400
Subject: Fixed formatting to align with PEP 8

---
 nova/tests/api/openstack/test_servers.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index f651bb258..9d8ab8217 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -1163,8 +1163,8 @@ class ServersTest(test.TestCase):
         self.assertEqual(res.status_int, 400)
 
     def test_shutdown_status(self): 
-        new_return_server = return_server_with_power_state(power_state.SHUTDOWN)
-        self.stubs.Set(nova.db.api, 'instance_get', new_return_server)
+        new_server = return_server_with_power_state(power_state.SHUTDOWN)
+        self.stubs.Set(nova.db.api, 'instance_get', new_server)
         req = webob.Request.blank('/v1.0/servers/1')
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 200)
@@ -1172,8 +1172,8 @@ class ServersTest(test.TestCase):
         self.assertEqual(res_dict['server']['status'], 'SHUTDOWN')
         
     def test_shutoff_status(self): 
-        new_return_server = return_server_with_power_state(power_state.SHUTOFF)
-        self.stubs.Set(nova.db.api, 'instance_get', new_return_server)
+        new_server = return_server_with_power_state(power_state.SHUTOFF)
+        self.stubs.Set(nova.db.api, 'instance_get', new_server)
         req = webob.Request.blank('/v1.0/servers/1')
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 200)
-- 
cgit 


From e0e95c36f1d2c08c5ab419abdd8867c05d101475 Mon Sep 17 00:00:00 2001
From: Alex Meade <alex.meade@rackspace.com>
Date: Wed, 27 Apr 2011 00:30:33 -0400
Subject: pep8 fixes

---
 nova/tests/api/openstack/test_servers.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 9d8ab8217..f294b3b56 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -1162,7 +1162,7 @@ class ServersTest(test.TestCase):
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 400)
 
-    def test_shutdown_status(self): 
+    def test_shutdown_status(self):
         new_server = return_server_with_power_state(power_state.SHUTDOWN)
         self.stubs.Set(nova.db.api, 'instance_get', new_server)
         req = webob.Request.blank('/v1.0/servers/1')
@@ -1170,8 +1170,8 @@ class ServersTest(test.TestCase):
         self.assertEqual(res.status_int, 200)
         res_dict = json.loads(res.body)
         self.assertEqual(res_dict['server']['status'], 'SHUTDOWN')
-        
-    def test_shutoff_status(self): 
+
+    def test_shutoff_status(self):
         new_server = return_server_with_power_state(power_state.SHUTOFF)
         self.stubs.Set(nova.db.api, 'instance_get', new_server)
         req = webob.Request.blank('/v1.0/servers/1')
@@ -1179,7 +1179,7 @@ class ServersTest(test.TestCase):
         self.assertEqual(res.status_int, 200)
         res_dict = json.loads(res.body)
         self.assertEqual(res_dict['server']['status'], 'SHUTOFF')
-        
+
 
 class TestServerCreateRequestXMLDeserializer(unittest.TestCase):
 
-- 
cgit 


From 8e6875e8c9b45a03396d5e4312c4f9136b1dc552 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Wed, 27 Apr 2011 14:03:05 -0700
Subject: further cleanup of nova/exceptions.py

---
 nova/tests/test_instance_types.py |  6 +++---
 nova/tests/test_scheduler.py      | 10 +++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py
index dd7d0737e..ef271518c 100644
--- a/nova/tests/test_instance_types.py
+++ b/nova/tests/test_instance_types.py
@@ -75,13 +75,13 @@ class InstanceTypeTestCase(test.TestCase):
     def test_invalid_create_args_should_fail(self):
         """Ensures that instance type creation fails with invalid args"""
         self.assertRaises(
-                exception.InvalidInputException,
+                exception.InvalidInput,
                 instance_types.create, self.name, 0, 1, 120, self.flavorid)
         self.assertRaises(
-                exception.InvalidInputException,
+                exception.InvalidInput,
                 instance_types.create, self.name, 256, -1, 120, self.flavorid)
         self.assertRaises(
-                exception.InvalidInputException,
+                exception.InvalidInput,
                 instance_types.create, self.name, 256, 1, "aa", self.flavorid)
 
     def test_non_existant_inst_type_shouldnt_delete(self):
diff --git a/nova/tests/test_scheduler.py b/nova/tests/test_scheduler.py
index efd12f930..968ef9d6c 100644
--- a/nova/tests/test_scheduler.py
+++ b/nova/tests/test_scheduler.py
@@ -768,14 +768,10 @@ class SimpleDriverTestCase(test.TestCase):
         s_ref = self._create_compute_service(host='somewhere',
                                              memory_mb_used=12)
 
-        try:
-            self.scheduler.driver._live_migration_dest_check(self.context,
-                                                             i_ref,
-                                                             'somewhere')
-        except exception.NotEmpty, e:
-            c = (e.message.find('Unable to migrate') >= 0)
+        self.assertRaises(exception.MigrationError,
+                          self.scheduler.driver._live_migration_dest_check,
+                          self.context, i_ref, 'somewhere')
 
-        self.assertTrue(c)
         db.instance_destroy(self.context, instance_id)
         db.service_destroy(self.context, s_ref['id'])
 
-- 
cgit 


From 6db188a3311ed62a24ba7202de2a6101c0d35c93 Mon Sep 17 00:00:00 2001
From: Eldar Nugaev <enugaev@griddynamics.com>
Date: Sun, 1 May 2011 01:01:01 -0700
Subject: Added checking ip_v6 flag and test for it

---
 nova/tests/test_virt.py | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index 462cf5aa0..b8a2b5c7a 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -44,7 +44,7 @@ def _concurrency(wait, done, target):
     done.send()
 
 
-def _create_network_info(count=1):
+def _create_network_info(count=1, ipv6=True):
     fake = 'fake'
     fake_ip = '0.0.0.0/0'
     fake_ip_2 = '0.0.0.1/0'
@@ -55,8 +55,11 @@ def _create_network_info(count=1):
                'cidr': fake_ip,
                'cidr_v6': fake_ip}
     mapping = {'mac': fake,
-               'ips': [{'ip': fake_ip}, {'ip': fake_ip}],
-               'ip6s': [{'ip': fake_ip}, {'ip': fake_ip_2}, {'ip': fake_ip_3}]}
+               'ips': [{'ip': fake_ip}, {'ip': fake_ip}]}
+    if ipv6:
+        mapping['ip6s'] = [{'ip': fake_ip},
+                           {'ip': fake_ip_2},
+                           {'ip': fake_ip_3}]
     return [(network, mapping) for x in xrange(0, count)]
 
 
@@ -825,12 +828,20 @@ class IptablesFirewallTestCase(test.TestCase):
                         "TCP port 80/81 acceptance rule wasn't added")
         db.instance_destroy(admin_ctxt, instance_ref['id'])
 
-    def test_filters_for_instance(self):
-        network_info = _create_network_info()
+    def test_filters_for_instance_with_ip_v6(self):
+        self.flags(use_ipv6=True)
+        network_info = _create_network_info(ipv6=FLAGS.use_ipv6)
         rulesv4, rulesv6 = self.fw._filters_for_instance("fake", network_info)
         self.assertEquals(len(rulesv4), 2)
         self.assertEquals(len(rulesv6), 3)
 
+    def test_filters_for_instance_without_ip_v6(self):
+        self.flags(use_ipv6=False)
+        network_info = _create_network_info(ipv6=FLAGS.use_ipv6)
+        rulesv4, rulesv6 = self.fw._filters_for_instance("fake", network_info)
+        self.assertEquals(len(rulesv4), 2)
+        self.assertEquals(len(rulesv6), 0)
+
     def multinic_iptables_test(self):
         ipv4_rules_per_network = 2
         ipv6_rules_per_network = 3
-- 
cgit 


From 30d7b7d17f2f08fa35417b03e47cfb7d4c8b24b2 Mon Sep 17 00:00:00 2001
From: Eldar Nugaev <enugaev@griddynamics.com>
Date: Sun, 1 May 2011 20:43:06 -0700
Subject: small changes in libvirt tests

---
 nova/tests/test_virt.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index b8a2b5c7a..47432baef 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -44,7 +44,9 @@ def _concurrency(wait, done, target):
     done.send()
 
 
-def _create_network_info(count=1, ipv6=True):
+def _create_network_info(count=1, ipv6=None):
+    if ipv6 is None:
+        ipv6 = FLAGS.use_ipv6
     fake = 'fake'
     fake_ip = '0.0.0.0/0'
     fake_ip_2 = '0.0.0.1/0'
@@ -830,14 +832,14 @@ class IptablesFirewallTestCase(test.TestCase):
 
     def test_filters_for_instance_with_ip_v6(self):
         self.flags(use_ipv6=True)
-        network_info = _create_network_info(ipv6=FLAGS.use_ipv6)
+        network_info = _create_network_info()
         rulesv4, rulesv6 = self.fw._filters_for_instance("fake", network_info)
         self.assertEquals(len(rulesv4), 2)
         self.assertEquals(len(rulesv6), 3)
 
     def test_filters_for_instance_without_ip_v6(self):
         self.flags(use_ipv6=False)
-        network_info = _create_network_info(ipv6=FLAGS.use_ipv6)
+        network_info = _create_network_info()
         rulesv4, rulesv6 = self.fw._filters_for_instance("fake", network_info)
         self.assertEquals(len(rulesv4), 2)
         self.assertEquals(len(rulesv6), 0)
-- 
cgit 


From 3be272f432b4385cf77787416762a360687a36bd Mon Sep 17 00:00:00 2001
From: Dan Prince <dan.prince@rackspace.com>
Date: Mon, 2 May 2011 10:17:51 -0400
Subject: Use my_ip for libvirt version of get_host_ip_addr.

---
 nova/tests/test_virt.py | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index 462cf5aa0..9305de4ca 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -641,6 +641,11 @@ class LibvirtConnTestCase(test.TestCase):
 
         self.assertTrue(count)
 
+    def test_get_host_ip_addr(self):
+        conn = libvirt_conn.LibvirtConnection(False)
+        ip = conn.get_host_ip_addr()
+        self.assertEquals(ip, FLAGS.my_ip)
+
     def tearDown(self):
         self.manager.delete_project(self.project)
         self.manager.delete_user(self.user)
-- 
cgit