novaclient: update to 2014.x latest

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

3 files changed, 42 insertions, 43 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-novaclient/fix_novaclient_memory_leak.patch b/meta-openstack/recipes-devtools/python/python-novaclient/fix_novaclient_memory_leak.patch
index 5732d9a..37688d6 100644
--- a/meta-openstack/recipes-devtools/python/python-novaclient/fix_novaclient_memory_leak.patch
+++ b/meta-openstack/recipes-devtools/python/python-novaclient/fix_novaclient_memory_leak.patch
@@ -5,9 +5,11 @@
  novaclient/v3/client.py                         |    6 ++++++
  4 files changed, 32 insertions(+)
 
---- a/novaclient/client.py
-+++ b/novaclient/client.py
-@@ -87,6 +87,7 @@
+Index: git/novaclient/client.py
+===================================================================
+--- git.orig/novaclient/client.py
++++ git/novaclient/client.py
+@@ -266,6 +266,7 @@
              self.timeout = None
  
          self.times = []  # [("item", starttime, endtime), ...]
@@ -15,9 +17,9 @@
  
          self.management_url = self.bypass_url or None
          self.auth_token = auth_token
-@@ -139,6 +140,12 @@
-     def reset_timings(self):
-         self.times = []
+@@ -328,6 +329,12 @@
+         else:
+             return name, value
  
 +    def get_timings_max_len(self):
 +        return self.times_max_len
@@ -28,7 +30,7 @@
      def http_log_req(self, method, url, kwargs):
          if not self.http_log_debug:
              return
-@@ -214,6 +221,9 @@
+@@ -441,6 +448,9 @@
          resp, body = self.request(url, method, **kwargs)
          self.times.append(("%s %s" % (method, url),
                             start_time, time.time()))
@@ -38,9 +40,11 @@
          return resp, body
  
      def _cs_request(self, url, method, **kwargs):
---- a/novaclient/openstack/common/apiclient/client.py
-+++ b/novaclient/openstack/common/apiclient/client.py
-@@ -90,6 +90,7 @@
+Index: git/novaclient/openstack/common/apiclient/client.py
+===================================================================
+--- git.orig/novaclient/openstack/common/apiclient/client.py
++++ git/novaclient/openstack/common/apiclient/client.py
+@@ -92,6 +92,7 @@
          self.user_agent = user_agent or self.user_agent
  
          self.times = []  # [("item", starttime, endtime), ...]
@@ -48,7 +52,7 @@
          self.timings = timings
  
          # requests within the same session can reuse TCP connections from pool
-@@ -142,6 +143,12 @@
+@@ -144,6 +145,12 @@
      def reset_timings(self):
          self.times = []
  
@@ -61,7 +65,7 @@
      def request(self, method, url, **kwargs):
          """Send an http request with the specified characteristics.
  
-@@ -173,6 +180,9 @@
+@@ -175,6 +182,9 @@
          if self.timings:
              self.times.append(("%s %s" % (method, url),
                                 start_time, time.time()))
@@ -71,33 +75,31 @@
          self._http_log_resp(resp)
  
          if resp.status_code >= 400:
---- a/novaclient/v1_1/client.py
-+++ b/novaclient/v1_1/client.py
-@@ -156,6 +156,12 @@
-     def reset_timings(self):
-         self.client.reset_timings()
- 
+Index: git/novaclient/v1_1/client.py
+===================================================================
+--- git.orig/novaclient/v1_1/client.py
++++ git/novaclient/v1_1/client.py
+@@ -232,3 +232,9 @@
+         credentials are wrong.
+         """
+         self.client.authenticate()
++
 +    def get_timings_max_len(self):
 +        return self.client.get_timings_max_len()
 +
 +    def set_timings_max_len(self, new_len):
 +        self.client.set_timings_max_len(new_len)
-+
-     def authenticate(self):
+Index: git/novaclient/v3/client.py
+===================================================================
+--- git.orig/novaclient/v3/client.py
++++ git/novaclient/v3/client.py
+@@ -194,3 +194,9 @@
+         credentials are wrong.
          """
-         Authenticate against the server.
---- a/novaclient/v3/client.py
-+++ b/novaclient/v3/client.py
-@@ -121,6 +121,12 @@
-     def reset_timings(self):
-         self.client.reset_timings()
- 
+         self.client.authenticate()
++
 +    def get_timings_max_len(self):
 +        return self.client.get_timings_max_len()
 +
 +    def set_timings_max_len(self, new_len):
 +        self.client.set_timings_max_len(new_len)
-+
-     def authenticate(self):
-         """
-         Authenticate against the server.
diff --git a/meta-openstack/recipes-devtools/python/python-novaclient/novaclient-specify-full-path-to-test-certificate.patch b/meta-openstack/recipes-devtools/python/python-novaclient/novaclient-specify-full-path-to-test-certificate.patch
index dff3edd..60d5984 100644
--- a/meta-openstack/recipes-devtools/python/python-novaclient/novaclient-specify-full-path-to-test-certificate.patch
+++ b/meta-openstack/recipes-devtools/python/python-novaclient/novaclient-specify-full-path-to-test-certificate.patch
@@ -17,19 +17,16 @@ Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
  novaclient/tests/v1_1/test_servers.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/novaclient/tests/v1_1/test_servers.py b/novaclient/tests/v1_1/test_servers.py
-index a48204c..443adc3 100644
---- a/novaclient/tests/v1_1/test_servers.py
-+++ b/novaclient/tests/v1_1/test_servers.py
-@@ -462,7 +462,7 @@ class ServersTest(utils.TestCase):
+Index: git/novaclient/tests/v1_1/test_servers.py
+===================================================================
+--- git.orig/novaclient/tests/v1_1/test_servers.py
++++ git/novaclient/tests/v1_1/test_servers.py
+@@ -489,7 +489,7 @@
  
      def test_get_password(self):
-         s = cs.servers.get(1234)
+         s = self.cs.servers.get(1234)
 -        self.assertEqual(s.get_password('novaclient/tests/idfake.pem'),
 +        self.assertEqual(s.get_password('%PYTHON_SITEPACKAGES_DIR%/novaclient/tests/idfake.pem'),
                           b'FooBar123')
-         cs.assert_called('GET', '/servers/1234/os-server-password')
+         self.assert_called('GET', '/servers/1234/os-server-password')
  
--- 
-1.9.3
-
diff --git a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
index 3bb3aac..70cb39e 100644
--- a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
@@ -12,8 +12,8 @@ SRC_URI = "\
         file://novaclient-specify-full-path-to-test-certificate.patch \
         "
 
-PV="2.16.0+git${SRCPV}"
-SRCREV="9344f02649df65af26ca13b4d3443be73beb5d4e"
+PV="2.18.1+git${SRCPV}"
+SRCREV="b21d6775685fc2ca9bd5c13e817343789d7ad6c5"
 S = "${WORKDIR}/git"
 
 inherit setuptools