Merge "Adding mock-detached util function and cleaning up util help output"

diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2
index 455ae0f..91d0c47 100644 (file)
--- a/build/nics-template.yaml.jinja2
+++ b/build/nics-template.yaml.jinja2
@@ -94,7 +94,7 @@ resources:
                   name: nic1
                   # force the MAC address of the bridge to this interface
                   primary: true
-                {%- if 'public_network' in enabled_networks and vlans['private_network'] is number %}
+                {%- if 'public_network' in enabled_networks and vlans['public_network'] is number %}
                 -
                   type: vlan
                   vlan_id: {get_param: ExternalNetworkVlanID}

diff --git a/lib/python/apex/network_environment.py b/lib/python/apex/network_environment.py
index fec6299..bf4bdc7 100644 (file)
--- a/lib/python/apex/network_environment.py
+++ b/lib/python/apex/network_environment.py
@@ -9,11 +9,13 @@
 
 import yaml
 import re
-from .common.constants import ADMIN_NETWORK
-from .common.constants import PRIVATE_NETWORK
-from .common.constants import STORAGE_NETWORK
-from .common.constants import PUBLIC_NETWORK
-from .common.constants import API_NETWORK
+from .common.constants import (
+    ADMIN_NETWORK,
+    PRIVATE_NETWORK,
+    STORAGE_NETWORK,
+    PUBLIC_NETWORK,
+    API_NETWORK,
+)
 
 PORTS = '/ports'
 # Resources defined by <resource name>: <prefix>