SHARE
TWEET

Untitled

a guest Sep 9th, 2014 202 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. commit adea0fb98cc6f0f4593251cda966a675d8eefa5c
  2. Author: John Doe <johndoe@example.com>
  3. Date:   Tue Sep 9 16:32:59 2014 +0000
  4.  
  5.     Fix openstack write/check exts to pass the tests
  6.  
  7. diff --git a/morphlib/exts/openstack.check b/morphlib/exts/openstack.check
  8. index d9d3ef2..495b85f 100755
  9. --- a/morphlib/exts/openstack.check
  10. +++ b/morphlib/exts/openstack.check
  11. @@ -60,8 +60,9 @@ class OpenStackCheckExtension(morphlib.writeexts.WriteExtension):
  12.      def check_location(self, location):
  13.          x = urlparse.urlparse(location)
  14.          if x.scheme not in ['http', 'https']:
  15. -            raise cliapp.AppException('URL schema must be http or https in %s' \
  16. -                                      % location)
  17. +            raise cliapp.AppException(
  18. +                            'URL schema must be http or https in %s' \
  19. +                            % location)
  20.          if (x.path != '/v2.0' and x.path != '/v2.0/'):
  21.              raise cliapp.AppException('API version must be v2.0 in %s'\
  22.                                        % location)
  23. diff --git a/morphlib/exts/openstack.write b/morphlib/exts/openstack.write
  24. index 01d6d62..71202ff 100755
  25. --- a/morphlib/exts/openstack.write
  26. +++ b/morphlib/exts/openstack.write
  27. @@ -1,5 +1,5 @@
  28.  #!/usr/bin/python
  29. -# Copyright (C) 2013  Codethink Limited
  30. +# Copyright (C) 2013 - 2014  Codethink Limited
  31.  #
  32.  # This program is free software; you can redistribute it and/or modify
  33.  # it under the terms of the GNU General Public License as published by
  34.  
  35. commit 6c21847b438886e2fa82e465befe5f48547d1ffb
  36. Author: John Doe <johndoe@example.com>
  37. Date:   Tue Sep 9 16:32:17 2014 +0000
  38.  
  39.     Fix up openstack.write extension
  40.  
  41. diff --git a/morphlib/exts/openstack.write b/morphlib/exts/openstack.write
  42. index ac2e2c8..01d6d62 100755
  43. --- a/morphlib/exts/openstack.write
  44. +++ b/morphlib/exts/openstack.write
  45. @@ -63,7 +63,6 @@ class OpenStackWriteExtension(morphlib.writeexts.WriteExtension):
  46.              raise cliapp.AppException('Wrong number of command line args')
  47.          
  48.          temp_root, location = args
  49. -        self.check_location(location)
  50.  
  51.          os_params = self.get_openstack_parameters()
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
Top