Add Oplink attenuation extension and channel power drivers.
Change-Id: I2558595b03cbb6cc58237dc48b8a03e83357fe1f
diff --git a/drivers/default/src/main/java/org/onosproject/driver/DefaultCodecRegister.java b/drivers/default/src/main/java/org/onosproject/driver/DefaultCodecRegister.java
index f6bda7a..e6e5649 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/DefaultCodecRegister.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/DefaultCodecRegister.java
@@ -32,6 +32,7 @@
import org.onosproject.driver.extensions.NiciraSetTunnelDst;
import org.onosproject.driver.extensions.OfdpaMatchVlanVid;
import org.onosproject.driver.extensions.OfdpaSetVlanVid;
+import org.onosproject.driver.extensions.OplinkAttenuation;
import org.onosproject.driver.extensions.codec.MoveExtensionTreatmentCodec;
import org.onosproject.driver.extensions.codec.NiciraMatchNshSiCodec;
import org.onosproject.driver.extensions.codec.NiciraMatchNshSpiCodec;
@@ -43,6 +44,7 @@
import org.onosproject.driver.extensions.codec.NiciraSetTunnelDstCodec;
import org.onosproject.driver.extensions.codec.OfdpaMatchVlanVidCodec;
import org.onosproject.driver.extensions.codec.OfdpaSetVlanVidCodec;
+import org.onosproject.driver.extensions.codec.OplinkAttenuationCodec;
import org.slf4j.Logger;
import static org.slf4j.LoggerFactory.getLogger;
@@ -71,6 +73,7 @@
codecService.registerCodec(NiciraSetNshContextHeader.class, new NiciraSetNshContextHeaderCodec());
codecService.registerCodec(OfdpaMatchVlanVid.class, new OfdpaMatchVlanVidCodec());
codecService.registerCodec(OfdpaSetVlanVid.class, new OfdpaSetVlanVidCodec());
+ codecService.registerCodec(OplinkAttenuation.class, new OplinkAttenuationCodec());
log.info("Registered default driver codecs.");
}
@@ -87,6 +90,7 @@
codecService.unregisterCodec(NiciraSetNshContextHeader.class);
codecService.unregisterCodec(OfdpaMatchVlanVid.class);
codecService.unregisterCodec(OfdpaSetVlanVid.class);
+ codecService.unregisterCodec(OplinkAttenuation.class);
log.info("Unregistered default driver codecs.");
}
}
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/OplinkAttenuation.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/OplinkAttenuation.java
new file mode 100644
index 0000000..7816759
--- /dev/null
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/OplinkAttenuation.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2016 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.driver.extensions;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.Maps;
+import org.onlab.util.KryoNamespace;
+import org.onosproject.net.flow.AbstractExtension;
+import org.onosproject.net.flow.instructions.ExtensionTreatment;
+import org.onosproject.net.flow.instructions.ExtensionTreatmentType;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * Instruction for Oplink channel attenuation.
+ */
+public class OplinkAttenuation extends AbstractExtension implements ExtensionTreatment {
+ private static final String KEY_ATT = "attenuation";
+
+ private int attenuation;
+
+ private final KryoNamespace appKryo = new KryoNamespace.Builder()
+ .register(Map.class)
+ .build("OplinkAttenuation");
+
+ /**
+ * Creates new attenuation instruction.
+ * @param attenuation attenuation value
+ */
+ public OplinkAttenuation(int attenuation) {
+ this.attenuation = attenuation;
+ }
+
+ /**
+ * Gets the attenuation value.
+ * @return attenuation
+ */
+ public int getAttenuation() {
+ return attenuation;
+ }
+
+ /**
+ * Modify the attenuation value.
+ * @param attenuation new attenuation value
+ */
+ public void setAttenuation(int attenuation) {
+ this.attenuation = attenuation;
+ }
+
+ @Override
+ public ExtensionTreatmentType type() {
+ return ExtensionTreatmentType.ExtensionTreatmentTypes.OPLINK_ATTENUATION.type();
+ }
+
+ @Override
+ public byte[] serialize() {
+ Map<String, Object> values = Maps.newHashMap();
+ values.put(KEY_ATT, attenuation);
+ return appKryo.serialize(values);
+ }
+
+ @Override
+ public void deserialize(byte[] data) {
+ Map<String, Object> values = appKryo.deserialize(data);
+ attenuation = (int) values.get(KEY_ATT);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(attenuation);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj instanceof OplinkAttenuation) {
+ OplinkAttenuation that = (OplinkAttenuation) obj;
+ return Objects.equals(attenuation, that.attenuation);
+ }
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(getClass())
+ .add(KEY_ATT, attenuation)
+ .toString();
+ }
+}
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/OplinkExtensionTreatmentInterpreter.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/OplinkExtensionTreatmentInterpreter.java
new file mode 100644
index 0000000..d33e0b6
--- /dev/null
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/OplinkExtensionTreatmentInterpreter.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2016 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.driver.extensions;
+
+import org.onosproject.net.driver.AbstractHandlerBehaviour;
+import org.onosproject.net.flow.instructions.ExtensionTreatment;
+import org.onosproject.net.flow.instructions.ExtensionTreatmentType;
+import org.onosproject.openflow.controller.ExtensionTreatmentInterpreter;
+import org.projectfloodlight.openflow.protocol.OFActionType;
+import org.projectfloodlight.openflow.protocol.OFFactory;
+import org.projectfloodlight.openflow.protocol.action.OFAction;
+import org.projectfloodlight.openflow.protocol.action.OFActionExperimenter;
+import org.projectfloodlight.openflow.protocol.action.OFActionOplinkAtt;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxm;
+import org.projectfloodlight.openflow.types.U32;
+
+/**
+ * Interpreter for Oplink OpenFlow treatment extensions.
+ */
+public class OplinkExtensionTreatmentInterpreter extends AbstractHandlerBehaviour
+ implements ExtensionTreatmentInterpreter {
+
+ private static final long ATTENUATION_EXP = 0xff000088L;
+
+ @Override
+ public boolean supported(ExtensionTreatmentType extensionTreatmentType) {
+ if (extensionTreatmentType.equals(
+ ExtensionTreatmentType.ExtensionTreatmentTypes.OPLINK_ATTENUATION.type())) {
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public OFAction mapInstruction(OFFactory factory, ExtensionTreatment extensionTreatment) {
+ ExtensionTreatmentType type = extensionTreatment.type();
+ if (type.equals(ExtensionTreatmentType.ExtensionTreatmentTypes.OPLINK_ATTENUATION.type())) {
+ int att = ((OplinkAttenuation) extensionTreatment).getAttenuation();
+ return factory.actions().oplinkAtt(factory.oxms().ochSigatt(U32.ofRaw(att)));
+ }
+ return null;
+ }
+
+ @Override
+ public ExtensionTreatment mapAction(OFAction action) throws UnsupportedOperationException {
+ if (action.getType().equals(OFActionType.EXPERIMENTER)) {
+ OFActionExperimenter actionExp = (OFActionExperimenter) action;
+ if (actionExp.getExperimenter() == ATTENUATION_EXP) {
+ OFActionOplinkAtt actionAtt = (OFActionOplinkAtt) action;
+ return new OplinkAttenuation(((OFOxm<U32>) actionAtt.getField()).getValue().getRaw());
+ }
+ }
+ return null;
+ }
+}
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/codec/OplinkAttenuationCodec.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/codec/OplinkAttenuationCodec.java
new file mode 100644
index 0000000..ed2da00
--- /dev/null
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/codec/OplinkAttenuationCodec.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2016 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.driver.extensions.codec;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.driver.extensions.OplinkAttenuation;
+
+import static org.onlab.util.Tools.nullIsIllegal;
+
+/**
+ * JSON Codec for OplinkAttenuation class.
+ */
+public class OplinkAttenuationCodec extends JsonCodec<OplinkAttenuation> {
+ private static final String ATTENUATION = "attenuation";
+ private static final String MISSING_ATT = "Missing value for \"attenuation\"";
+
+ @Override
+ public OplinkAttenuation decode(ObjectNode json, CodecContext context) {
+ if (json == null || !json.isObject()) {
+ return null;
+ }
+ String att = nullIsIllegal(json.get(ATTENUATION), MISSING_ATT).asText();
+ return new OplinkAttenuation(Integer.valueOf(att));
+ }
+}