Revision cc3f266e snf-cyclades-app/synnefo/api/networks.py
b/snf-cyclades-app/synnefo/api/networks.py | ||
---|---|---|
85 | 85 |
d = {'id': network_id, 'name': network.name} |
86 | 86 |
if detail: |
87 | 87 |
d['cidr'] = network.subnet |
88 |
d['cidr6'] = network.subnet6 |
|
88 | 89 |
d['gateway'] = network.gateway |
90 |
d['gateway6'] = network.gateway6 |
|
89 | 91 |
d['dhcp'] = network.dhcp |
90 | 92 |
d['type'] = network.type |
91 | 93 |
d['updated'] = util.isoformat(network.updated) |
... | ... | |
156 | 158 |
name = d['name'] |
157 | 159 |
# TODO: Fix this temp values: |
158 | 160 |
subnet = d.get('cidr', '192.168.1.0/24') |
161 |
subnet6 = d.get('cidr6', None) |
|
159 | 162 |
gateway = d.get('gateway', None) |
163 |
gateway6 = d.get('gateway6', None) |
|
160 | 164 |
type = d.get('type', 'PRIVATE_MAC_FILTERED') |
161 | 165 |
dhcp = d.get('dhcp', True) |
162 | 166 |
except (KeyError, ValueError): |
... | ... | |
185 | 189 |
name=name, |
186 | 190 |
userid=request.user_uniq, |
187 | 191 |
subnet=subnet, |
192 |
subnet6=subnet6, |
|
188 | 193 |
gateway=gateway, |
194 |
gateway6=gateway6, |
|
189 | 195 |
dhcp=dhcp, |
190 | 196 |
type=type, |
191 | 197 |
link=link, |
Also available in: Unified diff