commit fc59b6898ce5a8c6759f995a21560a49576324dd
author Wei-Yu Chen <weiyu@opennetworking.org> Mon Sep 13 13:54:16 2021 +0800
committer Wei-Yu Chen <weiyu@opennetworking.org> Mon Sep 13 13:54:16 2021 +0800
tree 25eb27ca490a471a738135b1f77e6d5a53717350
parent bd495ba5d64ca45c3f509edc88bf62f2dc676c73

Fix incorrect route for fabric configuration

Change-Id: I1e900e0ca5a949c93f5f7ffd5b9b86d1b585e367

inventory/example-netbox.yml

diff --git a/inventory/example-netbox.yml b/inventory/example-netbox.yml
index 18fec73..efff6ec 100644
--- a/inventory/example-netbox.yml
+++ b/inventory/example-netbox.yml
@@ -2,10 +2,10 @@
 # example inventory file for pulling from Netbox
 
 plugin: netbox.netbox.nb_inventory
-api_endpoint: "https://10.76.28.11/"
+api_endpoint: "https://netbox.infra.onlab.us/"
 
-# token can be created in Netbox at https://10.76.28.11/user/api-tokens/
-token: "abcd1234"
+# token can be created in Netbox at https://netbox.infra.onlab.us/user/api-tokens/
+token: "REPLACE_YOUR_TOKEN_HERE"
 
 # wet to true once DNS is working
 validate_certs: false
@@ -17,9 +17,5 @@
 device_query_filters:
   - has_primary_ip: 'true'
 
-## used with the netbox edgeconfig script
-ip_prefixes:
-  - "10.0.0.0/25"
-  - "10.0.0.128/25"
-  - "10.0.1.0/25"
-  - "10.0.1.128/25"
+## use as the key to retrieve data from netbox
+tenant_name: "example"

scripts/nbhelper/container.py

diff --git a/scripts/nbhelper/container.py b/scripts/nbhelper/container.py
index 6e0cfcf..2f3748a 100644
--- a/scripts/nbhelper/container.py
+++ b/scripts/nbhelper/container.py
@@ -102,7 +102,7 @@
             ):
                 if prefix.reserved_ips:
                     return list(prefix.reserved_ips.values())
-            else:
+            elif not ip_addr:
                 if prefix.reserved_ips:
                     ret.extend(list(prefix.reserved_ips.values()))