mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-05 12:16:13 +02:00
Code Issues Projects Releases Wiki Activity

Moving Extensions codecs to net/flow to avoid circular dependencies

Browse Source 
Change-Id: I93dc5580ff46f57afe93dd4d1f0217359d5c89c2
This commit is contained in:
Andrea Campanella 2017-07-13 19:45:15 +02:00 committed by Thomas Vachuska
parent 897fd2de22
commit 2cfe8ef782
11 changed files with 110 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/src/main/java/org/onosproject/codec/ExtensionSelectorCodec.java
View File

@ -21,7 +21,9 @@ import org.onosproject.net.flow.criteria.ExtensionSelector;
/**
* Interface for encode and decode extension selector.
* @deprecated 1.11.0 Loon use interface under core/api/net/flow.
*/
@Deprecated
public interface ExtensionSelectorCodec extends HandlerBehaviour {
/**

2
core/api/src/main/java/org/onosproject/codec/ExtensionTreatmentCodec.java
View File

@ -21,7 +21,9 @@ import org.onosproject.net.flow.instructions.ExtensionTreatment;
/**
* Interface for encode and decode extension treatment.
* @deprecated 1.11.0 Loon use interface under core/api/net/flow.
*/
@Deprecated
public interface ExtensionTreatmentCodec extends HandlerBehaviour {
/**

49
core/api/src/main/java/org/onosproject/net/flow/ExtensionSelectorCodec.java Normal file
View File

@ -0,0 +1,49 @@
/*
* Copyright 2017-present 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.
*/
package org.onosproject.net.flow;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.onosproject.codec.CodecContext;
import org.onosproject.net.driver.HandlerBehaviour;
import org.onosproject.net.flow.criteria.ExtensionSelector;
/**
* Interface for encode and decode extension selector.
*/
public interface ExtensionSelectorCodec extends HandlerBehaviour {
/**
* Encodes an extension selector to an JSON object.
*
* @param extensionSelector extension selector
* @param context encoding context
* @return JSON object
*/
default ObjectNode encode(ExtensionSelector extensionSelector, CodecContext context) {
return null;
}
/**
* Decodes an JSON object to an extension selector.
*
* @param objectNode JSON object
* @param context decoding context
* @return extension selector
*/
default ExtensionSelector decode(ObjectNode objectNode, CodecContext context) {
return null;
}
}

49
core/api/src/main/java/org/onosproject/net/flow/ExtensionTreatmentCodec.java Normal file
View File

@ -0,0 +1,49 @@
/*
* Copyright 2017-present 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.
*/
package org.onosproject.net.flow;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.onosproject.codec.CodecContext;
import org.onosproject.net.driver.HandlerBehaviour;
import org.onosproject.net.flow.instructions.ExtensionTreatment;
/**
* Interface for encode and decode extension treatment.
*/
public interface ExtensionTreatmentCodec extends HandlerBehaviour {
/**
* Encodes an extension treatment to an JSON object.
*
* @param extensionTreatment extension treatment
* @param context encoding context
* @return JSON object
*/
default ObjectNode encode(ExtensionTreatment extensionTreatment, CodecContext context) {
return null;
}
/**
* Decodes an JSON object to an extension treatment.
*
* @param objectNode JSON object
* @param context decoding context
* @return extension treatment
*/
default ExtensionTreatment decode(ObjectNode objectNode, CodecContext context) {
return null;
}
}

2
core/common/src/main/java/org/onosproject/codec/impl/DecodeInstructionCodecHelper.java
View File

@ -27,7 +27,7 @@ import org.onlab.packet.TpPort;
import org.onlab.packet.VlanId;
import org.onlab.util.HexString;
import org.onosproject.codec.CodecContext;
import org.onosproject.codec.ExtensionTreatmentCodec;
import org.onosproject.net.flow.ExtensionTreatmentCodec;
import org.onosproject.core.GroupId;
import org.onosproject.net.ChannelSpacing;
import org.onosproject.net.Device;

2
core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java
View File

@ -20,7 +20,7 @@ import org.onlab.osgi.DefaultServiceDirectory;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.util.HexString;
import org.onosproject.codec.CodecContext;
import org.onosproject.codec.ExtensionTreatmentCodec;
import org.onosproject.net.flow.ExtensionTreatmentCodec;
import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
import org.onosproject.net.OchSignal;

4
drivers/default/src/main/resources/onos-drivers.xml
View File

@ -30,13 +30,13 @@
impl="org.onosproject.driver.extensions.NiciraExtensionTreatmentInterpreter" />
<behaviour api="org.onosproject.net.behaviour.ExtensionTreatmentResolver"
impl="org.onosproject.driver.extensions.NiciraExtensionTreatmentInterpreter" />
<behaviour api="org.onosproject.codec.ExtensionTreatmentCodec"
<behaviour api="org.onosproject.net.flow.ExtensionTreatmentCodec"
impl="org.onosproject.driver.extensions.NiciraExtensionTreatmentInterpreter" />
<behaviour api="org.onosproject.openflow.controller.ExtensionSelectorInterpreter"
impl="org.onosproject.driver.extensions.NiciraExtensionSelectorInterpreter" />
<behaviour api="org.onosproject.net.behaviour.ExtensionSelectorResolver"
impl="org.onosproject.driver.extensions.NiciraExtensionSelectorInterpreter" />
<behaviour api="org.onosproject.codec.ExtensionSelectorCodec"
<behaviour api="org.onosproject.net.flow.ExtensionSelectorCodec"
impl="org.onosproject.driver.extensions.NiciraExtensionSelectorInterpreter" />
<behaviour api="org.onosproject.net.behaviour.VlanQuery"
impl="org.onosproject.driver.query.FullVlanAvailable" />

2
drivers/optical/src/main/java/org/onosproject/driver/optical/extensions/OplinkExtensionTreatmentCodec.java
View File

@ -20,7 +20,7 @@ import org.onlab.osgi.DefaultServiceDirectory;
import org.onlab.osgi.ServiceDirectory;
import org.onosproject.codec.CodecContext;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.ExtensionTreatmentCodec;
import org.onosproject.net.flow.ExtensionTreatmentCodec;
import org.onosproject.driver.extensions.OplinkAttenuation;
import org.onosproject.net.driver.AbstractHandlerBehaviour;
import org.onosproject.net.flow.instructions.ExtensionTreatment;

2
drivers/optical/src/main/resources/optical-drivers.xml
View File

@ -60,7 +60,7 @@
impl="org.onosproject.net.optical.DefaultOpticalDevice"/>
<behaviour api="org.onosproject.net.behaviour.PowerConfig"
impl="org.onosproject.driver.optical.power.OplinkRoadmPowerConfig"/>
<behaviour api="org.onosproject.codec.ExtensionTreatmentCodec"
<behaviour api="org.onosproject.net.flow.ExtensionTreatmentCodec"
impl="org.onosproject.driver.optical.extensions.OplinkExtensionTreatmentCodec"/>
<behaviour api="org.onosproject.openflow.controller.ExtensionTreatmentInterpreter"
impl="org.onosproject.driver.extensions.OplinkExtensionTreatmentInterpreter"/>

2
protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/ExtensionSelectorInterpreter.java
View File

@ -17,7 +17,7 @@
package org.onosproject.openflow.controller;
import com.google.common.annotations.Beta;
import org.onosproject.codec.ExtensionSelectorCodec;
import org.onosproject.net.flow.ExtensionSelectorCodec;
import org.onosproject.net.flow.criteria.ExtensionSelector;
import org.onosproject.net.flow.criteria.ExtensionSelectorType;
import org.projectfloodlight.openflow.protocol.OFFactory;

2
protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/ExtensionTreatmentInterpreter.java
View File

@ -17,7 +17,7 @@
package org.onosproject.openflow.controller;
import com.google.common.annotations.Beta;
import org.onosproject.codec.ExtensionTreatmentCodec;
import org.onosproject.net.flow.ExtensionTreatmentCodec;
import org.onosproject.net.flow.instructions.ExtensionTreatment;
import org.onosproject.net.flow.instructions.ExtensionTreatmentType;
import org.projectfloodlight.openflow.protocol.OFFactory;