From 0ad2933a46ad829e08da9ec3346feeb3d0d8bb27 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Tue, 9 Sep 2014 17:49:22 +0100 Subject: Fix openstack write/check exts to pass the tests --- morphlib/exts/openstack.check | 2 +- morphlib/exts/openstack.write | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/morphlib/exts/openstack.check b/morphlib/exts/openstack.check index d9d3ef24..edc37cc1 100755 --- a/morphlib/exts/openstack.check +++ b/morphlib/exts/openstack.check @@ -60,7 +60,7 @@ 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' \ + 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'\ diff --git a/morphlib/exts/openstack.write b/morphlib/exts/openstack.write index ac2e2c8a..dc18f9aa 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 -- cgit v1.2.1 From 523af0fe4997b8fb2d215fd9090dee703e619402 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Tue, 9 Sep 2014 17:51:28 +0100 Subject: Fix up openstack.write extension The openstack.write extension was calling a nonexistent method 'check_location'. This metod was moved to openstack.check in the commit ba7d1d1ed3bad002ce36e5d4adf4e3794625091a. --- morphlib/exts/openstack.write | 1 - 1 file changed, 1 deletion(-) diff --git a/morphlib/exts/openstack.write b/morphlib/exts/openstack.write index dc18f9aa..516fe367 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() -- cgit v1.2.1