Revision f8352d29

b/snf-cyclades-app/synnefo/api/servers.py
128 128
    addresses = {}
129 129
    for nic in nics:
130 130
        net_nics = []
131
        net_nics.append({"version": 4, "addr": nic.ipv4})
131
        net_nics.append({"version": 4,
132
                         "addr": nic.ipv4,
133
                         "OS-EXT-IPS:type": "fixed"})
132 134
        if nic.ipv6:
133
            net_nics.append({"version": 6, "addr": nic.ipv6})
135
            net_nics.append({"version": 6,
136
                             "addr": nic.ipv6,
137
                             "OS-EXT-IPS:type": "fixed"})
134 138
        addresses[nic.network.id] = net_nics
135 139
    return addresses
136 140

  
......
167 171
            d['diagnostics'] = diagnostics_to_dict([diagnostic])
168 172
        else:
169 173
            d['diagnostics'] = []
174
        # Fixed
175
        d["security_groups"] = [{"name": "default"}]
176
        d["key_name"] = None
177
        d["config_drive"] = ""
178
        d["accessIPv4"] = ""
179
        d["accessIPv6"] = ""
170 180

  
171 181
    return d
172 182

  
b/snf-cyclades-app/synnefo/api/test/servers.py
141 141
        self.assertEqual(api_nic['id'], 'nic-%s-%s' % (db_vm.id, nic.index))
142 142
        api_address = server["addresses"]
143 143
        self.assertEqual(api_address[str(net.id)],
144
                          [{"version": 4, "addr": nic.ipv4},
145
                           {"version": 6, "addr": nic.ipv6}])
144
               [{"version": 4, "addr": nic.ipv4, "OS-EXT-IPS:type": "fixed"},
145
                {"version": 6, "addr": nic.ipv6, "OS-EXT-IPS:type": "fixed"}])
146 146

  
147 147
        metadata = server['metadata']
148 148
        self.assertEqual(len(metadata), 1)

Also available in: Unified diff