From 6fbaecb3d01079d98aa6c83ced2c05b0f526942b Mon Sep 17 00:00:00 2001 From: "Narinder Gupta (for canonical email id)" Date: Mon, 8 Feb 2016 10:18:52 -0600 Subject: [PATCH 1/3] included the support for Be,sfc and vpn feature. --- hooks/odl_controller_utils.py | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/hooks/odl_controller_utils.py b/hooks/odl_controller_utils.py index 4a9ceec..582312a 100644 --- a/hooks/odl_controller_utils.py +++ b/hooks/odl_controller_utils.py @@ -27,9 +27,42 @@ PROFILES = { "odl-dlux-core"], "port": 8080 }, - "openvswitch-odl-lithium": { + "openvswitch-odl-li": { "feature:install": ["odl-ovsdb-openstack"], "port": 8080 + }, + "openvswitch-odl-Be": { + "feature:install": ["odl-ovsdb-openstack", + "odl-ovsdb-plugin", + "odl-restconf", + "odl-aaa-authn", + "odl-dlux-all"], + "port": 8080 + }, + "openvswitch-odl-Be-l3": { + "feature:install": ["odl-ovsdb-openstack", + "odl-ovsdb-plugin"], + "port": 8080 + }, + "openvswitch-odl-Be-sfc": { + "feature:install": ["odl-ovsdb-openstack", + "odl-sfc-core", + "odl-sfc-sb-rest", + "odl-sfc-ui", + "odl-sfc-netconf", + "odl-sfc-ovs", + "odl-sfcofl2", + "odl-sfc-test-consumer"], + "port": 8080 + }, + "openvswitch-odl-Be-vpn": { + "feature:install": ["odl-ovsdb-openstack", + "odl-vpnservice-api", + "odl-vpnservice-impl", + "odl-vpnservice-impl-rest", + "odl-vpnservice-impl-ui", + "odl-vpnservice-core"], + "port": 8080 } } PROFILES["default"] = PROFILES["openvswitch-odl"] From 5e2a444aeef4caa51222cf0ecbf83f64e3056902 Mon Sep 17 00:00:00 2001 From: "Narinder Gupta (for canonical email id)" Date: Mon, 8 Feb 2016 11:15:38 -0600 Subject: [PATCH 2/3] corrected as plugin there is no feature. --- hooks/odl_controller_utils.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hooks/odl_controller_utils.py b/hooks/odl_controller_utils.py index 582312a..75ccf70 100644 --- a/hooks/odl_controller_utils.py +++ b/hooks/odl_controller_utils.py @@ -33,15 +33,13 @@ PROFILES = { }, "openvswitch-odl-Be": { "feature:install": ["odl-ovsdb-openstack", - "odl-ovsdb-plugin", "odl-restconf", "odl-aaa-authn", "odl-dlux-all"], "port": 8080 }, "openvswitch-odl-Be-l3": { - "feature:install": ["odl-ovsdb-openstack", - "odl-ovsdb-plugin"], + "feature:install": ["odl-ovsdb-openstack"], "port": 8080 }, "openvswitch-odl-Be-sfc": { From ddbc7c4a15414b108239376a1f6d13410d2564e9 Mon Sep 17 00:00:00 2001 From: "Narinder Gupta (for canonical email id)" Date: Wed, 10 Feb 2016 16:38:16 -0600 Subject: [PATCH 3/3] remove extra space --- hooks/odl_controller_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hooks/odl_controller_utils.py b/hooks/odl_controller_utils.py index 75ccf70..8004ab8 100644 --- a/hooks/odl_controller_utils.py +++ b/hooks/odl_controller_utils.py @@ -33,7 +33,7 @@ PROFILES = { }, "openvswitch-odl-Be": { "feature:install": ["odl-ovsdb-openstack", - "odl-restconf", + "odl-restconf", "odl-aaa-authn", "odl-dlux-all"], "port": 8080