| commit | 87892e25d1c8f14ae2cad9b0d66f1872ed5e52ad | [log] [tgz] |
|---|---|---|
| author | Carmelo Cascone <carmelo@opennetworking.org> | Mon Nov 13 16:01:29 2017 -0800 |
| committer | Carmelo Cascone <carmelo@opennetworking.org> | Mon Nov 13 16:15:17 2017 -0800 |
| tree | fbaad1d5d4495005c881a54f4de8a6a5577cf578 | |
| parent | 1afeccea20e3c5dc9d2f4d39e090438153cc84dc [diff] |
ONOS-7066 ONOS-7067 PI abstractions refactoring and P4Info model parser Includes changes previously reviewed in #15607, #15877, and #15955. Change-Id: Ie2ff62e415f2099832ebfe05961a879b7b188fc3
diff --git a/protocols/p4runtime/api/src/main/java/org/onosproject/p4runtime/api/P4RuntimeClient.java b/protocols/p4runtime/api/src/main/java/org/onosproject/p4runtime/api/P4RuntimeClient.java index 5072c65..7ecbd80 100644 --- a/protocols/p4runtime/api/src/main/java/org/onosproject/p4runtime/api/P4RuntimeClient.java +++ b/protocols/p4runtime/api/src/main/java/org/onosproject/p4runtime/api/P4RuntimeClient.java
@@ -19,13 +19,13 @@ import com.google.common.annotations.Beta; import org.onosproject.net.pi.model.PiPipeconf; import org.onosproject.net.pi.runtime.PiActionGroup; -import org.onosproject.net.pi.runtime.PiActionProfileId; +import org.onosproject.net.pi.model.PiActionProfileId; import org.onosproject.net.pi.runtime.PiCounterCellData; import org.onosproject.net.pi.runtime.PiCounterCellId; -import org.onosproject.net.pi.runtime.PiCounterId; +import org.onosproject.net.pi.model.PiCounterId; import org.onosproject.net.pi.runtime.PiPacketOperation; import org.onosproject.net.pi.runtime.PiTableEntry; -import org.onosproject.net.pi.runtime.PiTableId; +import org.onosproject.net.pi.model.PiTableId; import java.nio.ByteBuffer; import java.util.Collection;
diff --git a/protocols/p4runtime/api/src/main/java/org/onosproject/p4runtime/api/P4RuntimeGroupReference.java b/protocols/p4runtime/api/src/main/java/org/onosproject/p4runtime/api/P4RuntimeGroupReference.java index 543ae4d..55c9e61 100644 --- a/protocols/p4runtime/api/src/main/java/org/onosproject/p4runtime/api/P4RuntimeGroupReference.java +++ b/protocols/p4runtime/api/src/main/java/org/onosproject/p4runtime/api/P4RuntimeGroupReference.java
@@ -20,7 +20,7 @@ import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import org.onosproject.net.DeviceId; -import org.onosproject.net.pi.runtime.PiActionProfileId; +import org.onosproject.net.pi.model.PiActionProfileId; import org.onosproject.net.pi.runtime.PiActionGroupId; /**
diff --git a/protocols/p4runtime/api/src/main/java/org/onosproject/p4runtime/api/P4RuntimeTableEntryReference.java b/protocols/p4runtime/api/src/main/java/org/onosproject/p4runtime/api/P4RuntimeTableEntryReference.java index 5a0e9ca..d345f15 100644 --- a/protocols/p4runtime/api/src/main/java/org/onosproject/p4runtime/api/P4RuntimeTableEntryReference.java +++ b/protocols/p4runtime/api/src/main/java/org/onosproject/p4runtime/api/P4RuntimeTableEntryReference.java
@@ -19,8 +19,8 @@ import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import org.onosproject.net.DeviceId; +import org.onosproject.net.pi.model.PiTableId; import org.onosproject.net.pi.runtime.PiMatchKey; -import org.onosproject.net.pi.runtime.PiTableId; import static com.google.common.base.Preconditions.checkNotNull;