Revision dd2689f9
b/snf-cyclades-app/synnefo/db/migrations/0052_migrate_pool_entries.py | ||
---|---|---|
51 | 51 |
|
52 | 52 |
for bridge in bridges: |
53 | 53 |
if not bridge.available: |
54 |
available[bridge.index] = False |
|
54 |
# Bridge indexes in old BridgePool |
|
55 |
available[bridge.index - 1] = False |
|
55 | 56 |
available_map = bitarray_to_string(available) |
56 | 57 |
reserved_map = bitarray_to_string(reserved) |
57 | 58 |
|
... | ... | |
80 | 81 |
|
81 | 82 |
for macp in mac_prefixes: |
82 | 83 |
if not macp.available: |
83 |
available[macp.index] = False |
|
84 |
available[macp.index - 1] = False
|
|
84 | 85 |
|
85 | 86 |
for index in range(0, macp_length): |
86 | 87 |
mac = mac_from_index(macp_base, index) |
b/snf-cyclades-app/synnefo/db/pools/__init__.py | ||
---|---|---|
171 | 171 |
|
172 | 172 |
class BridgePool(PoolManager): |
173 | 173 |
def index_to_value(self, index): |
174 |
return self.pool_table.base + str(index) |
|
174 |
# Bridge indexes should start from 1 |
|
175 |
return self.pool_table.base + str(index + 1) |
|
175 | 176 |
|
176 | 177 |
def value_to_index(self, value): |
177 |
return int(value.replace(self.pool_table.base, "")) |
|
178 |
return int(value.replace(self.pool_table.base, "")) - 1
|
|
178 | 179 |
|
179 | 180 |
|
180 | 181 |
class MacPrefixPool(PoolManager): |
Also available in: Unified diff