← Back to branch summary

~rvb/maas/transaction-1.7-bug-1409852

« back to all changes in this revision

Viewing changes to src/maasserver/api/tests/test_ipaddresses.py

merged upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/api/tests/test_ipaddresses.py
31
31
class TestNetworksAPI(APITestCase):
32
32
 
33
33
    def make_interface(self, status=NODEGROUP_STATUS.ACCEPTED, **kwargs):
34
 
        cluster = factory.make_node_group(status=status, **kwargs)
35
 
        return factory.make_node_group_interface(cluster)
 
34
        cluster = factory.make_NodeGroup(status=status, **kwargs)
 
35
        return factory.make_NodeGroupInterface(cluster)
36
36
 
37
37
    def post_reservation_request(self, net):
38
38
        params = {
104
104
            response.content)
105
105
 
106
106
    def test_GET_returns_ipaddresses(self):
107
 
        original_ipaddress = factory.make_staticipaddress(
 
107
        original_ipaddress = factory.make_StaticIPAddress(
108
108
            user=self.logged_in_user)
109
109
        response = self.client.get(reverse('ipaddresses_handler'))
110
110
        self.assertEqual(httplib.OK, response.status_code, response.content)
133
133
        self.assertEqual([], json.loads(response.content))
134
134
 
135
135
    def test_GET_only_returns_request_users_addresses(self):
136
 
        ipaddress = factory.make_staticipaddress(user=self.logged_in_user)
137
 
        factory.make_staticipaddress(user=factory.make_user())
 
136
        ipaddress = factory.make_StaticIPAddress(user=self.logged_in_user)
 
137
        factory.make_StaticIPAddress(user=factory.make_User())
138
138
        response = self.client.get(reverse('ipaddresses_handler'))
139
139
        self.assertEqual(httplib.OK, response.status_code, response.content)
140
140
        parsed_result = json.loads(response.content)
145
145
        addrs = []
146
146
        for _ in range(3):
147
147
            addrs.append(
148
 
                factory.make_staticipaddress(user=self.logged_in_user))
 
148
                factory.make_StaticIPAddress(user=self.logged_in_user))
149
149
        response = self.client.get(reverse('ipaddresses_handler'))
150
150
        self.assertEqual(httplib.OK, response.status_code, response.content)
151
151
        parsed_result = json.loads(response.content)
156
156
        self.assertEqual(expected, observed)
157
157
 
158
158
    def test_POST_release_deallocates_address(self):
159
 
        ipaddress = factory.make_staticipaddress(user=self.logged_in_user)
 
159
        ipaddress = factory.make_StaticIPAddress(user=self.logged_in_user)
160
160
        response = self.post_release_request(ipaddress.ip)
161
161
        self.assertEqual(httplib.OK, response.status_code, response.content)
162
162
        self.assertIsNone(reload_object(ipaddress))
163
163
 
164
164
    def test_POST_release_does_not_delete_IP_that_I_dont_own(self):
165
 
        ipaddress = factory.make_staticipaddress(user=factory.make_user())
 
165
        ipaddress = factory.make_StaticIPAddress(user=factory.make_User())
166
166
        response = self.post_release_request(ipaddress.ip)
167
167
        self.assertEqual(
168
168
            httplib.NOT_FOUND, response.status_code, response.content)
169
169
 
170
170
    def test_POST_release_does_not_delete_other_IPs_I_own(self):
171
 
        ipaddress = factory.make_staticipaddress(user=self.logged_in_user)
172
 
        other_address = factory.make_staticipaddress(user=self.logged_in_user)
 
171
        ipaddress = factory.make_StaticIPAddress(user=self.logged_in_user)
 
172
        other_address = factory.make_StaticIPAddress(user=self.logged_in_user)
173
173
        response = self.post_release_request(ipaddress.ip)
174
174
        self.assertEqual(httplib.OK, response.status_code, response.content)
175
175
        self.assertIsNotNone(reload_object(other_address))