Commit 9903ab16 authored by Felipe Fonseca's avatar Felipe Fonseca
Browse files

Fixed OEDL generation bugs

parent 09507843
......@@ -564,7 +564,7 @@ class OEDL:
connections += [edge['destination'], edge['source']]
for link_connection in connections:
if link_connection['data']['resource_type'] == "openflow_switch":
if link_connection['data']['resource_type'] == "openflow_switch" and len(slice_resource['vlans']) != 0:
flowvisor = oedl.def_flowvisor(slice_resource['name'], link_connection['urn'])
new_slice = flowvisor.add_slice(slice_resource['name'], link_connection['urn'], '"tcp:#{controller_ip}:6633"')
match = "in_port={0},dl_vlan={1}".format(link_connection['port'],
......@@ -608,7 +608,7 @@ class OEDL:
connections += [edge['destination'], edge['source']]
for link_connection in connections:
if link_connection['data']['resource_type'] == "openflow_switch":
if link_connection['data']['resource_type'] == "openflow_switch" and len(slice_resource['vlans']) != 0:
flowvisor = oedl.def_flowvisor(slice_resource['name'], link_connection['urn'])
new_slice = flowvisor.add_slice(slice_resource['name'], link_connection['urn'],
'"tcp:#{controller_ip}:6633"')
......
......@@ -445,7 +445,7 @@ def _create_minimum_topology(topology, slice_resource):
edges[(edge[0], edge[1])] = edge_data
for edx in edge:
if edx not in nodes:
node_data = graph.node[edx]['data']
node_data = graph.nodes[edx]['data']
nodes[edx] = node_data
for path in all_paths:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment