Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- commit adea0fb98cc6f0f4593251cda966a675d8eefa5c
- Author: John Doe <johndoe@example.com>
- Date: Tue Sep 9 16:32:59 2014 +0000
- Fix openstack write/check exts to pass the tests
- diff --git a/morphlib/exts/openstack.check b/morphlib/exts/openstack.check
- index d9d3ef2..495b85f 100755
- --- a/morphlib/exts/openstack.check
- +++ b/morphlib/exts/openstack.check
- @@ -60,8 +60,9 @@ class OpenStackCheckExtension(morphlib.writeexts.WriteExtension):
- def check_location(self, location):
- x = urlparse.urlparse(location)
- if x.scheme not in ['http', 'https']:
- - raise cliapp.AppException('URL schema must be http or https in %s' \
- - % location)
- + raise cliapp.AppException(
- + 'URL schema must be http or https in %s' \
- + % location)
- if (x.path != '/v2.0' and x.path != '/v2.0/'):
- raise cliapp.AppException('API version must be v2.0 in %s'\
- % location)
- diff --git a/morphlib/exts/openstack.write b/morphlib/exts/openstack.write
- index 01d6d62..71202ff 100755
- --- a/morphlib/exts/openstack.write
- +++ b/morphlib/exts/openstack.write
- @@ -1,5 +1,5 @@
- #!/usr/bin/python
- -# Copyright (C) 2013 Codethink Limited
- +# Copyright (C) 2013 - 2014 Codethink Limited
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- commit 6c21847b438886e2fa82e465befe5f48547d1ffb
- Author: John Doe <johndoe@example.com>
- Date: Tue Sep 9 16:32:17 2014 +0000
- Fix up openstack.write extension
- diff --git a/morphlib/exts/openstack.write b/morphlib/exts/openstack.write
- index ac2e2c8..01d6d62 100755
- --- a/morphlib/exts/openstack.write
- +++ b/morphlib/exts/openstack.write
- @@ -63,7 +63,6 @@ class OpenStackWriteExtension(morphlib.writeexts.WriteExtension):
- raise cliapp.AppException('Wrong number of command line args')
- temp_root, location = args
- - self.check_location(location)
- os_params = self.get_openstack_parameters()
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement