Merge "Remove connection CRUD methods"

examples/jenkins/delete.py

@@ -37,8 +37,8 @@ def delete_jenkins(conn, name, opts):
             print(str(ip))
             ip = conn.network.find_ip(ip)
             conn.network.remove_ip_from_port(ip)
-            conn.delete(ip)
+            conn.network.delete_ip(ip)
-        conn.delete(server)
+        conn.compute.delete_server(server)
 
     keypair.delete(conn, name)
     network.delete(conn, name)

examples/keypair/delete.py

@@ -29,7 +29,7 @@ def delete(conn, name):
     kp = conn.compute.find_keypair(name)
     if kp is not None:
         print(str(kp))
-        conn.delete(kp)
+        conn.compute.delete_keypair(kp)
 
 
 def run_keypair(opts):

examples/network/delete.py

@@ -41,18 +41,18 @@ def delete(conn, name):
                 pass
         for port in conn.network.get_subnet_ports(subnet.id):
             print(str(port))
-            conn.delete(port)
+            conn.network.delete_port(port)
 
     if router is not None:
-        conn.delete(router)
+        conn.network.delete_router(router)
 
     if subnet:
-        conn.delete(subnet)
+        conn.network.delete_subnet(subnet)
 
     network = conn.network.find_network(name)
     if network is not None:
         print(str(network))
-        conn.delete(network)
+        conn.network.delete_network(network)
 
 
 def run_network(opts):

openstack/connection.py

@@ -220,48 +220,3 @@ class Connection(object):
             setattr(self, attr_name, proxy_class(self.session))
         except Exception as e:
             _logger.warn("Unable to load %s: %s" % (module, e))
-
-    def create(self, obj):
-        """Create an object.
-
-        :param obj: A resource object.
-        :type resource: :class:`~openstack.resource.Resource`
-        """
-        obj.create(self.session)
-        return obj
-
-    def get(self, obj, include_headers=False):
-        """Get an object.
-
-        :param obj: A resource object.
-        :type resource: :class:`~openstack.resource.Resource`
-        :param bool include_headers: Read object headers.
-        """
-        obj.get(self.session, include_headers)
-        return obj
-
-    def head(self, obj):
-        """Get an object.
-
-        :param obj: A resource object.
-        :type resource: :class:`~openstack.resource.Resource`
-        """
-        obj.head(self.session)
-        return obj
-
-    def update(self, obj):
-        """Update an object.
-
-        :param obj: A resource object.
-        :type resource: :class:`~openstack.resource.Resource`
-        """
-        obj.update(self.session)
-        return obj
-
-    def delete(self, obj):
-        """Delete an object.
-
-        :param obj: A resource object.
-        :type resource: :class:`~openstack.resource.Resource`
-        """
-        obj.delete(self.session)

openstack/tests/unit/test_connection.py

@@ -13,10 +13,8 @@
 import mock
 
 from openstack.auth.identity import v2
-from openstack.auth import service_filter
 from openstack import connection
 from openstack import profile
-from openstack import resource
 from openstack.tests.unit import base
 from openstack import transport
 
@@ -87,82 +85,3 @@ class TestConnection(base.TestCase):
         conn = connection.Connection(authenticator=self.auth,
                                      user_agent=user_agent)
         self.assertTrue(conn.transport._user_agent.startswith(user_agent))
-
-
-class TestService(service_filter.ServiceFilter):
-    valid_versions = [service_filter.ValidVersion('v2')]
-
-    def __init__(self):
-        super(TestService, self).__init__(service_type='test')
-
-
-class TestResource(resource.Resource):
-    resource_key = "testable"
-    resources_key = "testables"
-    base_path = "/testables"
-    service = TestService()
-    allow_create = True
-    allow_retrieve = True
-    allow_update = True
-    allow_delete = True
-    allow_list = True
-    allow_head = True
-    name = resource.prop('name')
-
-
-class TestConnectionObjectMethods(base.TestCase):
-    def setUp(self):
-        super(TestConnectionObjectMethods, self).setUp()
-        self.conn = connection.Connection(authenticator=mock.MagicMock(),
-                                          transport=mock.MagicMock())
-        self.conn.session = mock.MagicMock()
-        self.args = {'name': 'fee', 'id': 'fie'}
-        self.body = {'testable': self.args}
-        self.response = mock.Mock
-        self.response.body = self.body
-
-    def test_obj_create(self):
-        test = TestResource.existing(**self.args)
-        self.conn.session.put = mock.MagicMock()
-        self.conn.session.put.and_return = self.response
-        self.assertEqual(test, self.conn.create(test))
-        url = 'testables/fie'
-        self.conn.session.put.assert_called_with(url, json=self.body,
-                                                 service=test.service)
-
-    def test_obj_get(self):
-        test = TestResource.existing(**self.args)
-        self.conn.session.get = mock.MagicMock()
-        self.conn.session.get.and_return = self.response
-        self.assertEqual(test, self.conn.get(test))
-        url = 'testables/fie'
-        self.conn.session.get.assert_called_with(url, service=test.service)
-
-    def test_obj_head(self):
-        test = TestResource.existing(**self.args)
-        self.conn.session.head = mock.MagicMock()
-        self.conn.session.head.and_return = self.response
-        self.assertEqual(test, self.conn.head(test))
-        url = 'testables/fie'
-        self.conn.session.head.assert_called_with(url, service=test.service,
-                                                  accept=None)
-
-    def test_obj_update(self):
-        test = TestResource.existing(**self.args)
-        test['name'] = 'newname'
-        self.body = {'testable': {'name': 'newname'}}
-        self.conn.session.put = mock.MagicMock()
-        self.conn.session.put.and_return = self.response
-        self.assertEqual(test, self.conn.update(test))
-        url = 'testables/fie'
-        self.conn.session.put.assert_called_with(url, json=self.body,
-                                                 service=test.service)
-
-    def test_obj_delete(self):
-        test = TestResource.existing(**self.args)
-        self.conn.session.delete = mock.MagicMock()
-        self.conn.session.delete.and_return = self.response
-        self.assertEqual(None, self.conn.delete(test))
-        url = 'testables/fie'
-        self.conn.session.delete.assert_called_with(url, service=test.service,
-                                                    accept=None)