Revision 097009bf
b/snf-cyclades-app/synnefo/api/subnets.py | ||
---|---|---|
129 | 129 |
|
130 | 130 |
if ipversion == 6: |
131 | 131 |
networks.validate_network_params(None, None, cidr, gateway) |
132 |
slac = subnet.get('slac', None) |
|
132 |
slac = subnet.get('enable_slac', None)
|
|
133 | 133 |
if slac is not None: |
134 |
dhcp = check_boolean_value(slac, "slac") |
|
134 |
dhcp = check_boolean_value(slac, "enable_slac")
|
|
135 | 135 |
else: |
136 | 136 |
dhcp = check_boolean_value(subnet.get('enable_dhcp', True), "dhcp") |
137 | 137 |
else: |
... | ... | |
278 | 278 |
'allocation_pools': pools if pools is not None else []}) |
279 | 279 |
|
280 | 280 |
if subnet.ipversion == 6: |
281 |
dictionary['slac'] = subnet.dhcp |
|
281 |
dictionary['enable_slac'] = subnet.dhcp
|
|
282 | 282 |
|
283 | 283 |
return dictionary |
284 | 284 |
|
b/snf-cyclades-app/synnefo/api/tests/subnets.py | ||
---|---|---|
100 | 100 |
'network_id': test_net.id, |
101 | 101 |
'cidr': '10.0.3.0/24', |
102 | 102 |
'ip_version': 4, |
103 |
'slac': False} |
|
103 |
'enable_slac': False}
|
|
104 | 104 |
} |
105 | 105 |
response = self.post(SUBNETS_URL, test_net.userid, |
106 | 106 |
json.dumps(request), "json") |
... | ... | |
114 | 114 |
'network_id': test_net.id, |
115 | 115 |
'cidr': 'fdc1:4992:1130:fc0b::/64', |
116 | 116 |
'ip_version': 6, |
117 |
'slac': False} |
|
117 |
'enable_slac': False}
|
|
118 | 118 |
} |
119 | 119 |
response = self.post(SUBNETS_URL, test_net.userid, |
120 | 120 |
json.dumps(request), "json") |
... | ... | |
128 | 128 |
'network_id': test_net.id, |
129 | 129 |
'cidr': 'fdc1:4992:1130:fc0b::/64', |
130 | 130 |
'ip_version': 6, |
131 |
'slac': 'Random'} |
|
131 |
'enable_slac': 'Random'}
|
|
132 | 132 |
} |
133 | 133 |
response = self.post(SUBNETS_URL, test_net.userid, |
134 | 134 |
json.dumps(request), "json") |
Also available in: Unified diff