libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject [4/6] git commit: Merge branch 'LIBCLOUD-512_Add_OpenStack_Snapshot_Support' of https://github.com/DivvyCloud/libcloud into LIBCLOUD-512_Add_OpenStack_Snapshot_Support
Date Thu, 06 Feb 2014 20:14:05 GMT
Merge branch 'LIBCLOUD-512_Add_OpenStack_Snapshot_Support' of https://github.com/DivvyCloud/libcloud
into LIBCLOUD-512_Add_OpenStack_Snapshot_Support

Conflicts:
	libcloud/compute/drivers/openstack.py
	libcloud/test/compute/test_openstack.py


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/1f588a64
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/1f588a64
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/1f588a64

Branch: refs/heads/trunk
Commit: 1f588a643a81f675a75d12fe81031d28d2da561e
Parents: d97705a caf6a27
Author: Chris DeRamus <chris@divvycloud.com>
Authored: Thu Feb 6 08:00:16 2014 -0500
Committer: Chris DeRamus <chris@divvycloud.com>
Committed: Thu Feb 6 08:00:16 2014 -0500

----------------------------------------------------------------------
 libcloud/test/compute/test_openstack.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/1f588a64/libcloud/test/compute/test_openstack.py
----------------------------------------------------------------------
diff --cc libcloud/test/compute/test_openstack.py
index bdcabee,0edad6a..1386e2b
--- a/libcloud/test/compute/test_openstack.py
+++ b/libcloud/test/compute/test_openstack.py
@@@ -1892,37 -1879,18 +1892,35 @@@ class OpenStack_1_1_MockHttp(MockHttpTe
  
          return (httplib.OK, body, self.json_content_headers, httplib.responses[httplib.OK])
  
- <<<<<<< HEAD
 +    def _v1_1_slug_servers_12086_action(self, method, url, body, headers):
 +        if method == "POST":
 +            body = self.fixtures.load('_servers_12086_console_output.json')
 +            return (httplib.ACCEPTED, body, self.json_content_headers, httplib.responses[httplib.OK])
 +        else:
 +            raise NotImplementedError()
 +
- =======
      def _v1_1_slug_os_snapshots(self, method, url, body, headers):
-         if method == 'GET':
+         if method == "GET":
              body = self.fixtures.load('_os_snapshots.json')
-         elif method == 'POST':
+         elif method == "POST":
              body = self.fixtures.load('_os_snapshots_create.json')
          else:
              raise NotImplementedError()
  
          return (httplib.OK, body, self.json_content_headers, httplib.responses[httplib.OK])
  
 +    def _v1_1_slug_os_snapshots_RACKSPACE(self, method, url, body, headers):
 +        if method == 'GET':
 +            body = self.fixtures.load('_os_snapshots_rackspace.json')
 +        elif method == 'POST':
 +            body = self.fixtures.load('_os_snapshots_create_rackspace.json')
 +        else:
 +            raise NotImplementedError()
 +
 +        return (httplib.OK, body, self.json_content_headers, httplib.responses[httplib.OK])
 +
      def _v1_1_slug_os_snapshots_3fbbcccf_d058_4502_8844_6feeffdf4cb5(self, method, url,
body, headers):
-         if method == 'DELETE':
+         if method == "DELETE":
              body = ''
          else:
              raise NotImplementedError()


Mime
View raw message