External interface can be set as a string

This commit is contained in:
Junaid Ali 2016-05-12 05:35:22 -07:00
parent 2212d1eae1
commit 0c32a4b93f
2 changed files with 7 additions and 21 deletions

View File

@ -267,22 +267,12 @@ def get_gw_interfaces():
Gateway node can have multiple interfaces. This function parses json
provided in config to get all gateway interfaces for this node.
'''
node_interfaces = []
try:
all_interfaces = json.loads(config('external-interfaces'))
except ValueError:
raise ValueError("Invalid json provided for gateway interfaces")
hostname = get_unit_hostname()
if hostname in all_interfaces:
node_interfaces = all_interfaces[hostname].split(',')
elif 'DEFAULT' in all_interfaces:
node_interfaces = all_interfaces['DEFAULT'].split(',')
for interface in node_interfaces:
if not interface_exists(interface):
log('Provided gateway interface %s does not exist'
% interface)
raise ValueError('Provided gateway interface does not exist')
return node_interfaces
interface = config('external-interfaces')
if not interface_exists(interface):
log('Provided gateway interface %s does not exist'
% interface)
raise ValueError('Provided gateway interface does not exist')
return interface
def ensure_mtu():

View File

@ -1,7 +1,3 @@
{{ fabric_interface }} = fabric_core host
{% if ext_interfaces -%}
{% for ip in ext_interfaces -%}
{{ ip }} = access_phys
{% endfor -%}
{% endif -%}
{{ ext_interfaces }} = access_phys