Revision b3a43976 snf-cyclades-app/synnefo/api/tests/servers.py

b/snf-cyclades-app/synnefo/api/tests/servers.py
161 161

  
162 162
    def test_server_fqdn(self):
163 163
        vm = mfactory.VirtualMachineFactory()
164
        # test no public ip
165
        with override_settings(settings,
166
                               CYCLADES_SERVERS_FQDN="vm.example.org"):
167
            response = self.myget("servers/%d" % vm.id, vm.userid)
168
            server = json.loads(response.content)['server']
169
            self.assertEqual(server["SNF:fqdn"], "")
170
        mfactory.IPv4AddressFactory(nic__machine=vm, network__public=True)
164 171
        with override_settings(settings,
165 172
                               CYCLADES_SERVERS_FQDN="vm.example.org"):
166 173
            response = self.myget("servers/%d" % vm.id, vm.userid)
......
206 213

  
207 214
    def test_server_port_forwarding(self):
208 215
        vm = mfactory.VirtualMachineFactory()
216
        # test None if the server has no public IP
209 217
        ports = {
210 218
            22: ("foo", 61000),
211 219
            80: lambda ip, id, fqdn, user: ("bar", 61001)}
212 220
        with override_settings(settings,
213 221
                               CYCLADES_PORT_FORWARDING=ports):
214 222
            response = self.myget("servers/%d" % vm.id, vm.userid)
215
            server = json.loads(response.content)['server']
216
            self.assertEqual(server["SNF:port_forwarding"],
217
                             {"22": {"host": "foo", "port": "61000"},
218
                              "80": {"host": "bar", "port": "61001"}})
223
        server = json.loads(response.content)['server']
224
        self.assertEqual(server["SNF:port_forwarding"], {})
225

  
226
        # Add with public IP
227
        mfactory.IPv4AddressFactory(nic__machine=vm, network__public=True)
228
        with override_settings(settings,
229
                               CYCLADES_PORT_FORWARDING=ports):
230
            response = self.myget("servers/%d" % vm.id, vm.userid)
231
        server = json.loads(response.content)['server']
232
        self.assertEqual(server["SNF:port_forwarding"],
233
                         {"22": {"host": "foo", "port": "61000"},
234
                          "80": {"host": "bar", "port": "61001"}})
219 235

  
220 236
        def _port_from_ip(ip, base):
221 237
            fields = ip.split('.', 4)

Also available in: Unified diff