← Back to team overview

canonical-hw-cert team mailing list archive

[Merge] ~kevinyeh/cc-lab-manager:skip-ipv6-subnet into cc-lab-manager:master

 

Kevin Yeh has proposed merging ~kevinyeh/cc-lab-manager:skip-ipv6-subnet into cc-lab-manager:master.

Commit message:
Update: skip searching IP in ipv6 subnet.

Requested reviews:
  Canonical Hardware Certification (canonical-hw-cert)

For more details, see:
https://code.launchpad.net/~kevinyeh/cc-lab-manager/+git/cc-lab-manager/+merge/447518
-- 
Your team Canonical Hardware Certification is requested to review the proposed merge of ~kevinyeh/cc-lab-manager:skip-ipv6-subnet into cc-lab-manager:master.
diff --git a/cc_lab_manager/maas/update_maas_node_network.py b/cc_lab_manager/maas/update_maas_node_network.py
index b92a265..86d68d9 100644
--- a/cc_lab_manager/maas/update_maas_node_network.py
+++ b/cc_lab_manager/maas/update_maas_node_network.py
@@ -40,6 +40,8 @@ def get_maas_session(maas_ip, maas_admin, maas_admin_password):
 def find_subnet(client,ipaddr):   
     subnet = None
     for sub in client.subnets.list():
+        if "/64" in sub.name:
+            continue
         subnet_ip = ipaddress.ip_network(sub.cidr)
         node_ip = ipaddress.ip_network(ipaddr)
         if node_ip.subnet_of(subnet_ip):
@@ -93,4 +95,4 @@ def main():
     close_db(db)
 
 if __name__ == '__main__':
-        main()
\ No newline at end of file
+        main()