diff options
author | Ashlee Young <ashlee@wildernessvoice.com> | 2015-12-01 05:49:27 -0800 |
---|---|---|
committer | Ashlee Young <ashlee@wildernessvoice.com> | 2015-12-01 05:49:27 -0800 |
commit | e63291850fd0795c5700e25e67e5dee89ba54c5f (patch) | |
tree | 9707289536ad95bb739c9856761ad43275e07d8c /framework/src/onos/drivers/src/main/resources | |
parent | 671823e12bc13be9a8b87a5d7de33da1bb7a44e8 (diff) |
onos commit hash c2999f30c69e50df905a9d175ef80b3f23a98514
Change-Id: I2bb8562c4942b6d6a6d60b663db2e17540477b81
Signed-off-by: Ashlee Young <ashlee@wildernessvoice.com>
Diffstat (limited to 'framework/src/onos/drivers/src/main/resources')
-rw-r--r-- | framework/src/onos/drivers/src/main/resources/onos-drivers.xml | 13 | ||||
-rw-r--r-- | framework/src/onos/drivers/src/main/resources/org/onosproject/driver/netconf/controllers.xml | 36 |
2 files changed, 43 insertions, 6 deletions
diff --git a/framework/src/onos/drivers/src/main/resources/onos-drivers.xml b/framework/src/onos/drivers/src/main/resources/onos-drivers.xml index 0349e1c2..a172c18b 100644 --- a/framework/src/onos/drivers/src/main/resources/onos-drivers.xml +++ b/framework/src/onos/drivers/src/main/resources/onos-drivers.xml @@ -32,13 +32,14 @@ impl="org.onosproject.driver.handshaker.NiciraSwitchHandshaker"/> <behaviour api="org.onosproject.net.behaviour.ControllerConfig" impl="org.onosproject.driver.ovsdb.OvsdbControllerConfig"/> - <behaviour api="org.onosproject.openflow.controller.ExtensionInterpreter" - impl="org.onosproject.driver.extensions.NiciraExtensionInterpreter" /> - <behaviour api="org.onosproject.net.behaviour.ExtensionResolver" - impl="org.onosproject.driver.extensions.NiciraExtensionInterpreter" /> + <behaviour api="org.onosproject.openflow.controller.ExtensionTreatmentInterpreter" + impl="org.onosproject.driver.extensions.NiciraExtensionTreatmentInterpreter" /> + <behaviour api="org.onosproject.net.behaviour.ExtensionTreatmentResolver" + impl="org.onosproject.driver.extensions.NiciraExtensionTreatmentInterpreter" /> </driver> + <!--This driver is for simulated NETCONF devices through of-config tool on top og OVSDB--> <driver name="ovs-netconf" extends="default" - manufacturer="Nicira, Inc\." hwVersion="Open vSwitch" swVersion="2\..*"> + manufacturer="" hwVersion="" swVersion=""> <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver" impl="org.onosproject.driver.handshaker.NiciraSwitchHandshaker"/> <behaviour api="org.onosproject.net.behaviour.ControllerConfig" @@ -137,7 +138,7 @@ impl="org.onosproject.driver.pipeline.OpenVSwitchPipeline"/> </driver> <driver name="eci" extends="default" - manufacturer="ECI Telecom" hwVersion="optical" swVersion="V_1_0"> + manufacturer="ECI Telecom" hwVersion="Optical.*" swVersion="V_1_0"> <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver" impl="org.onosproject.driver.handshaker.OFOpticalSwitch13"/> </driver> diff --git a/framework/src/onos/drivers/src/main/resources/org/onosproject/driver/netconf/controllers.xml b/framework/src/onos/drivers/src/main/resources/org/onosproject/driver/netconf/controllers.xml new file mode 100644 index 00000000..21e4dd14 --- /dev/null +++ b/framework/src/onos/drivers/src/main/resources/org/onosproject/driver/netconf/controllers.xml @@ -0,0 +1,36 @@ +<!-- + ~ Copyright 2015 Open Networking Laboratory + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"> + <edit-config> + <target> + </target> + <default-operation> + </default-operation> + <config> + <capable-switch xmlns="urn:onf:config:yang"> + <id></id> + <logical-switches> + <switch> + <id></id> + <controllers> + </controllers> + </switch> + </logical-switches> + </capable-switch> + </config> + </edit-config> +</rpc>
\ No newline at end of file |