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

[AETHER-239] Add RAW_DEVICE_CONFIG extension

Browse Source 
Change-Id: I0acc1039800c7e69b87e3195f4f7ee732df241c0
This commit is contained in:
Yi Tseng 2020-06-08 17:10:56 +08:00 committed by Carmelo Cascone
parent 5ec2441fb3
commit 40e0a0c90d
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/api/src/main/java/org/onosproject/net/pi/model/PiPipeconf.java
View File

@ -125,6 +125,11 @@ public interface PiPipeconf {
// TODO: consider a better way to get the CPU port in the interpreter
// (see FabricInterpreter.java mapLogicalPortNumber). Perhaps using
// pipeconf annotations?
CPU_PORT_TXT
CPU_PORT_TXT,
/**
* Raw device config.
*/
RAW_DEVICE_CONFIG
}
}

32
drivers/barefoot/src/main/java/org/onosproject/drivers/barefoot/TofinoPipelineProgrammable.java
View File

@ -31,6 +31,7 @@ import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Optional;
import static org.onosproject.net.pi.model.PiPipeconf.ExtensionType.RAW_DEVICE_CONFIG;
import static org.onosproject.net.pi.model.PiPipeconf.ExtensionType.TOFINO_BIN;
import static org.onosproject.net.pi.model.PiPipeconf.ExtensionType.TOFINO_CONTEXT_JSON;
@ -48,14 +49,18 @@ public class TofinoPipelineProgrammable
@Override
public ByteBuffer createDeviceDataBuffer(PiPipeconf pipeconf) {
List<ByteBuffer> buffers = Lists.newLinkedList();
try {
buffers.add(nameBuffer(pipeconf));
buffers.add(extensionBuffer(pipeconf, TOFINO_BIN));
buffers.add(extensionBuffer(pipeconf, TOFINO_CONTEXT_JSON));
} catch (ExtensionException e) {
return null;
if (pipeconf.extension(RAW_DEVICE_CONFIG).isPresent()) {
buffers.add(rawDeviceConfig(pipeconf));
} else {
try {
buffers.add(nameBuffer(pipeconf));
buffers.add(extensionBuffer(pipeconf, TOFINO_BIN));
buffers.add(extensionBuffer(pipeconf, TOFINO_CONTEXT_JSON));
} catch (ExtensionException e) {
return null;
}
}
// Concatenate buffers (flip so they can be read).
@ -95,6 +100,19 @@ public class TofinoPipelineProgrammable
}
}
private ByteBuffer rawDeviceConfig(PiPipeconf pipeconf) {
try {
byte[] bytes = IOUtils.toByteArray(pipeconf.extension(RAW_DEVICE_CONFIG).get());
return ByteBuffer.allocate(bytes.length)
.order(ByteOrder.LITTLE_ENDIAN)
.put(bytes);
} catch (IOException ex) {
log.warn("Unable to read raw device config from pipeconf {}: {}",
pipeconf.id(), ex.getMessage());
throw new ExtensionException();
}
}
private static class ExtensionException extends IllegalArgumentException {
}
}