Created
August 25, 2014 11:52
-
-
Save donbowman/7fd35e24ab7b59207adb to your computer and use it in GitHub Desktop.
openstack-resource-snapshot no-subnet-patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/snapshot.py b/snapshot.py | |
old mode 100644 | |
new mode 100755 | |
index 08ed573..dc21f87 | |
--- a/snapshot.py | |
+++ b/snapshot.py | |
@@ -189,25 +189,28 @@ class ResourcePrinter(object): | |
row = [] | |
row.append(net['id']) | |
row.append(net['name']) | |
- for subnet in subnets: | |
- if subnet['id'] == net['subnets'][0]: | |
- row.append(subnet['name']) | |
- row.append(net['subnets'][0]) | |
- row.append(subnet['cidr']) | |
- row.append(subnet['enable_dhcp']) | |
- dns = '' | |
- for d in subnet['dns_nameservers']: | |
- if len(dns) == 0: | |
- dns = d | |
- else: | |
- dns = ", ".join([dns, d]) | |
- row.append(dns) | |
- | |
- if subnet['allocation_pools'][0]: | |
- row.append("start:%s end:%s" % | |
- (subnet['allocation_pools'][0]['start'], | |
- subnet['allocation_pools'][0]['end'])) | |
- | |
+ if len(net['subnets']): | |
+ for subnet in subnets: | |
+ if subnet['id'] == net['subnets'][0]: | |
+ row.append(subnet['name']) | |
+ row.append(net['subnets'][0]) | |
+ row.append(subnet['cidr']) | |
+ row.append(subnet['enable_dhcp']) | |
+ dns = '' | |
+ for d in subnet['dns_nameservers']: | |
+ if len(dns) == 0: | |
+ dns = d | |
+ else: | |
+ dns = ", ".join([dns, d]) | |
+ row.append(dns) | |
+ | |
+ if subnet['allocation_pools'][0]: | |
+ row.append("start:%s end:%s" % | |
+ (subnet['allocation_pools'][0]['start'], | |
+ subnet['allocation_pools'][0]['end'])) | |
+ else: | |
+ for i in range(0,6): | |
+ row.append('N/A') | |
networks[net['id']] = net['name'] | |
table_networks.add_row(row) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment