Revision e08afd0b
b/snf-cyclades-app/synnefo/api/management/commands/network-create.py | ||
---|---|---|
187 | 187 |
backend = get_backend(backend_id) |
188 | 188 |
backends.append(backend) |
189 | 189 |
|
190 |
network = networks.create(user_id=userid, name=name, flavor=flavor,
|
|
190 |
network = networks.create(userid=userid, name=name, flavor=flavor, |
|
191 | 191 |
subnet=subnet, gateway=gateway, |
192 | 192 |
subnet6=subnet6, gateway6=gateway6, |
193 | 193 |
dhcp=dhcp, public=public, mode=mode, |
b/snf-cyclades-app/synnefo/api/tests/servers.py | ||
---|---|---|
186 | 186 |
server = json.loads(response.content)['server'] |
187 | 187 |
self.assertEqual(server["SNF:fqdn"], "snf-%d.vm-%d.example.org" % |
188 | 188 |
(vm.id, vm.id)) |
189 |
|
|
190 |
vm = mfactory.VirtualMachineFactory() |
|
189 | 191 |
# No setting, no NICs |
190 | 192 |
with override_settings(settings, |
191 | 193 |
CYCLADES_SERVERS_FQDN=None): |
... | ... | |
240 | 242 |
ports = { |
241 | 243 |
22: lambda ip, id, fqdn, user: |
242 | 244 |
ip and ("gate", _port_from_ip(ip, 10000)) or None} |
245 |
vm = mfactory.VirtualMachineFactory() |
|
243 | 246 |
with override_settings(settings, |
244 | 247 |
CYCLADES_PORT_FORWARDING=ports): |
245 | 248 |
response = self.myget("servers/%d" % vm.id, vm.userid) |
Also available in: Unified diff