Commit 4be1092d authored by Felipe Fonseca's avatar Felipe Fonseca
Browse files

Merge branch 'release/1.3.1'

parents 4f0f4c68 9903ab16
portal/static/output
.idea/
*.pyc
__pycache__
......
......@@ -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"')
......
......@@ -98,7 +98,17 @@
<link rel="stylesheet" href="{% static 'css/slice.css' %}">
<script src='https://www.google.com/recaptcha/api.js'></script>
<title>FIBRE Portal</title>
<title>FIBRE Portal</title>
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-151354689-1"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'UA-151354689-1');
</script>
</head>
{% block body %}
......
......@@ -13,7 +13,7 @@ urlpatterns = [
# #############################################
# CAFe Authentication
url(r'^DS/$',
url(r'^Cafe/$',
views_auth.cafe_authentication,
name='cafe_authentication'),
......
......@@ -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