From 09ebd3fd688da6724030ef3a93d4365443ffdc77 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Fri, 2 Sep 2016 16:43:20 -0500 Subject: [PATCH] modify charm to support Boron Opendaylight Modified this charm to supprot Broron version fot Opendaylight for Mitaka integration and also SFC enablement. Change-Id: Ic0d2949b139d6aa8c9989dfa45d76257f82bf979 --- config.yaml | 1 + hooks/odl_controller_utils.py | 10 ++++++++++ tests/basic_deployment.py | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/config.yaml b/config.yaml index 04223bf..3f2c691 100644 --- a/config.yaml +++ b/config.yaml @@ -9,6 +9,7 @@ options: openvswitch-odl: Open vSwitch OpenDayLight for OpenStack - Helium release openvswitch-odl-lithium: Open vSwitch OpenDayLight for OpenStack - Lithium release openvswitch-odl-beryllium: Open vSwitch OpenDayLight for OpenStack - Beryllium release + openvswitch-odl-boron: Open vSwitch OpenDayLight for OpenStack - Boron release Only a single profile is supported at any one time. install-url: diff --git a/hooks/odl_controller_utils.py b/hooks/odl_controller_utils.py index 7128d01..7dda86f 100644 --- a/hooks/odl_controller_utils.py +++ b/hooks/odl_controller_utils.py @@ -76,6 +76,16 @@ PROFILES = { "odl-vpnservice-core"], "port": 8080 }, + "openvswitch-odl-boron": { + "feature:install": ["odl-netvirt-openstack", + "odl-dlux-all"], + "port": 8080 + }, + "openvswitch-odl-boron-sfc": { + "feature:install": ["odl-ovsdb-sfc-rest", + "odl-dlux-all"], + "port": 8080 + }, } PROFILES["default"] = PROFILES["openvswitch-odl"] diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 19faf60..2822d41 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -41,6 +41,10 @@ ODL_PROFILES = { 'location': 'AMULET_ODL_BE_LOCATION', 'profile': 'openvswitch-odl-beryllium' }, + 'boron': { + 'location': 'AMULET_ODL_BO_LOCATION', + 'profile': 'openvswitch-odl-boron' + }, }