Merge lp:~zulcss/nova/nova-asn1 into lp:~openstack-ubuntu-testing/nova/grizzly

[Chuck Short]

[Yolanda Robla (yolanda.robla)]

Looks good to me

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-07 15:10:36 +0000
+++ debian/changelog	2013-02-12 14:22:21 +0000
@@ -10,13 +10,12 @@
   * debian/rules: Call testr directly since run_tests.sh -N gives weird return
     value when tests pass.
   * debian/pyddist-overrides: Add websockify.
-
-  [ Adam Gandelman ]
-  * debian/control: Fix typo (websocikfy -> websockify).
-
-  [ Chuck Short ]
   * debian/nova-common.postinst: Removed config file conversion, since
     the option is no longer available. (LP: #1110567)
+  * debian/control: Add python-pyasn1 as a dependency.
+
+  [ Adam Gandelman ]
+  * debian/control: Fix typo (websocikfy -> websockify).
 
  -- Adam Gandelman <[e-mail]>  Wed, 23 Jan 2013 14:23:22 -0800
 

=== modified file 'debian/control'
--- debian/control	2013-01-23 22:23:41 +0000
+++ debian/control	2013-02-12 14:22:21 +0000
@@ -35,6 +35,7 @@
  python-paramiko,
  python-paste,
  python-pastedeploy (>= 1.5.0),
+ python-pyasn1,
  python-quantumclient,
  python-routes,
  python-setuptools,
@@ -89,6 +90,7 @@
  python-routes,
  python-simplejson,
  python-sqlalchemy-ext ( >= 0.7.8-1~) | python-sqlalchemy (<< 0.6.3-2),
+ python-pyasn1,
  python-suds,
  python-tempita,
  python-webob (>= 1.2.3),

=== modified file 'debian/patches/fix-ubuntu-tests.patch'
--- debian/patches/fix-ubuntu-tests.patch	2013-01-25 20:24:20 +0000
+++ debian/patches/fix-ubuntu-tests.patch	2013-02-12 14:22:21 +0000
@@ -1,31 +1,7 @@
-diff -Naurp nova-2013.1.orig/nova/tests/test_api.py nova-2013.1/nova/tests/test_api.py
---- nova-2013.1.orig/nova/tests/test_api.py	2013-01-25 05:53:44.000000000 -0600
-+++ nova-2013.1/nova/tests/test_api.py	2013-01-25 14:21:21.514255459 -0600
-@@ -26,9 +26,9 @@ from boto.ec2 import regioninfo
- from boto import exception as boto_exc
- # newer versions of boto use their own wrapper on top of httplib.HTTPResponse
- try:
--    import boto.connection as httplib
-+    from boto.connection import HTTPResponse
- except ImportError:
--    import httplib
-+    from httplib import HTTPResponse
- import fixtures
- import webob
- 
-@@ -79,7 +79,7 @@ class FakeHttplibConnection(object):
-         # guess that's a function the web server usually provides.
-         resp = "HTTP/1.0 %s" % resp
-         self.sock = FakeHttplibSocket(resp)
--        self.http_response = httplib.HTTPResponse(self.sock)
-+        self.http_response = HTTPResponse(self.sock)
-         # NOTE(vish): boto is accessing private variables for some reason
-         self._HTTPConnection__response = self.http_response
-         self.http_response.begin()
-diff -Naurp nova-2013.1.orig/tools/hacking.py nova-2013.1/tools/hacking.py
---- nova-2013.1.orig/tools/hacking.py	2013-01-25 05:53:45.000000000 -0600
-+++ nova-2013.1/tools/hacking.py	2013-01-25 14:21:11.742255454 -0600
-@@ -571,7 +571,7 @@ if __name__ == "__main__":
+diff -Naurp nova-2013.1.a4257.g4df4762.orig/tools/hacking.py nova-2013.1.a4257.g4df4762/tools/hacking.py
+--- nova-2013.1.a4257.g4df4762.orig/tools/hacking.py	2013-02-12 07:33:18.000000000 -0600
++++ nova-2013.1.a4257.g4df4762/tools/hacking.py	2013-02-12 07:51:45.212644383 -0600
+@@ -589,7 +589,7 @@ if __name__ == "__main__":
      #include nova path
      sys.path.append(os.getcwd())
      #Run once tests (not per line)