From 9a4b1deb5f9abdc88809ff80bccdfb503e66dccd Mon Sep 17 00:00:00 2001
From: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date: Mon, 15 Aug 2011 15:09:42 -0700
Subject: Removed newly added userdatarequesthandler for OS API, there is no
 need to add this handler since the existing Ec2 API metadatarequesthandler
 does the same job

---
 nova/tests/api/openstack/fakes.py                  |  2 -
 .../api/openstack/test_userdatarequesthandler.py   | 80 ----------------------
 2 files changed, 82 deletions(-)
 delete mode 100644 nova/tests/api/openstack/test_userdatarequesthandler.py

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py
index aa5aeef16..d11fbf788 100644
--- a/nova/tests/api/openstack/fakes.py
+++ b/nova/tests/api/openstack/fakes.py
@@ -36,7 +36,6 @@ from nova.api.openstack import auth
 from nova.api.openstack import extensions
 from nova.api.openstack import versions
 from nova.api.openstack import limits
-from nova.api.openstack import userdatarequesthandler
 from nova.auth.manager import User, Project
 import nova.image.fake
 from nova.image import glance
@@ -100,7 +99,6 @@ def wsgi_app(inner_app10=None, inner_app11=None, fake_auth=True,
     mapper['/v1.0'] = api10
     mapper['/v1.1'] = api11
     mapper['/'] = openstack.FaultWrapper(versions.Versions())
-    mapper['/latest'] = userdatarequesthandler.UserdataRequestHandler()
     return mapper
 
 
diff --git a/nova/tests/api/openstack/test_userdatarequesthandler.py b/nova/tests/api/openstack/test_userdatarequesthandler.py
deleted file mode 100644
index 0c63076b4..000000000
--- a/nova/tests/api/openstack/test_userdatarequesthandler.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2010-2011 OpenStack LLC.
-# 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.
-
-import base64
-import json
-import unittest
-import webob
-
-from nova import context
-from nova import db
-from nova import exception
-from nova import flags
-from nova import test
-from nova import log as logging
-
-from nova.tests.api.openstack import fakes
-
-LOG = logging.getLogger('nova.api.openstack.userdata')
-
-USER_DATA_STRING = ("This is an encoded string")
-ENCODE_STRING = base64.b64encode(USER_DATA_STRING)
-
-
-def return_server_by_address(context, address):
-    instance = {"user_data": ENCODE_STRING}
-    instance["fixed_ips"] = {"address": address,
-                             "floating_ips": []}
-    return instance
-
-
-def return_non_existing_server_by_address(context, address):
-    raise exception.NotFound()
-
-
-class TestUserdatarequesthandler(test.TestCase):
-
-    def setUp(self):
-        super(TestUserdatarequesthandler, self).setUp()
-        self.stubs.Set(db, 'instance_get_by_fixed_ip',
-                return_server_by_address)
-
-    def test_user_data(self):
-        req = webob.Request.blank('/latest/user-data')
-        res = req.get_response(fakes.wsgi_app())
-        self.assertEqual(res.status_int, 200)
-        self.assertEqual(res.body, USER_DATA_STRING)
-
-    def test_user_data_non_existing_fixed_address(self):
-        self.stubs.Set(db, 'instance_get_by_fixed_ip',
-                return_non_existing_server_by_address)
-        self.flags(use_forwarded_for=False)
-        req = webob.Request.blank('/latest/user-data')
-        res = req.get_response(fakes.wsgi_app())
-        self.assertEqual(res.status_int, 404)
-
-    def test_user_data_invalid_url(self):
-        req = webob.Request.blank('/latest/user-data-invalid')
-        res = req.get_response(fakes.wsgi_app())
-        self.assertEqual(res.status_int, 404)
-
-    def test_user_data_with_use_forwarded_header(self):
-        self.flags(use_forwarded_for=True)
-        req = webob.Request.blank('/latest/user-data')
-        res = req.get_response(fakes.wsgi_app())
-        self.assertEqual(res.status_int, 200)
-        self.assertEqual(res.body, USER_DATA_STRING)
-- 
cgit