Bumped P4Runtime to v1.0.0
Change-Id: Ie6419e45980a0394ce1e0439831f4b011a4d7487
diff --git a/protocols/p4runtime/model/src/main/java/org/onosproject/p4runtime/model/P4InfoParser.java b/protocols/p4runtime/model/src/main/java/org/onosproject/p4runtime/model/P4InfoParser.java
index ef8cb36..c69cd0b 100644
--- a/protocols/p4runtime/model/src/main/java/org/onosproject/p4runtime/model/P4InfoParser.java
+++ b/protocols/p4runtime/model/src/main/java/org/onosproject/p4runtime/model/P4InfoParser.java
@@ -215,7 +215,6 @@
tableFieldMapBuilder.build(),
tableActionMapBuilder.build(),
actionMap.get(tableMsg.getConstDefaultActionId()),
- tableMsg.getConstDefaultActionHasMutableParams(),
tableMsg.getIsConstTable()));
}
diff --git a/protocols/p4runtime/model/src/main/java/org/onosproject/p4runtime/model/P4TableModel.java b/protocols/p4runtime/model/src/main/java/org/onosproject/p4runtime/model/P4TableModel.java
index 5afad85..2eed1bb 100644
--- a/protocols/p4runtime/model/src/main/java/org/onosproject/p4runtime/model/P4TableModel.java
+++ b/protocols/p4runtime/model/src/main/java/org/onosproject/p4runtime/model/P4TableModel.java
@@ -49,7 +49,6 @@
private final ImmutableMap<PiMatchFieldId, PiMatchFieldModel> matchFields;
private final ImmutableMap<PiActionId, PiActionModel> actions;
private final PiActionModel constDefaultAction;
- private final boolean hasDefaultMutableParams;
private final boolean isConstTable;
P4TableModel(PiTableId id, PiTableType tableType,
@@ -58,7 +57,7 @@
ImmutableMap<PiMeterId, PiMeterModel> meters, boolean supportAging,
ImmutableMap<PiMatchFieldId, PiMatchFieldModel> matchFields,
ImmutableMap<PiActionId, PiActionModel> actions,
- PiActionModel constDefaultAction, boolean hasDefaultMutableParams,
+ PiActionModel constDefaultAction,
boolean isConstTable) {
this.id = id;
this.tableType = tableType;
@@ -70,7 +69,6 @@
this.matchFields = matchFields;
this.actions = actions;
this.constDefaultAction = constDefaultAction;
- this.hasDefaultMutableParams = hasDefaultMutableParams;
this.isConstTable = isConstTable;
}
@@ -125,11 +123,6 @@
}
@Override
- public boolean hasDefaultMutableParams() {
- return hasDefaultMutableParams;
- }
-
- @Override
public boolean isConstantTable() {
return isConstTable;
}
@@ -148,7 +141,7 @@
public int hashCode() {
return Objects.hash(id, tableType, actionProfile, maxSize, counters,
meters, supportAging, matchFields, actions,
- constDefaultAction, hasDefaultMutableParams);
+ constDefaultAction);
}
@Override
@@ -169,7 +162,6 @@
&& Objects.equals(this.supportAging, other.supportAging)
&& Objects.equals(this.matchFields, other.matchFields)
&& Objects.equals(this.actions, other.actions)
- && Objects.equals(this.constDefaultAction, other.constDefaultAction)
- && Objects.equals(this.hasDefaultMutableParams, other.hasDefaultMutableParams);
+ && Objects.equals(this.constDefaultAction, other.constDefaultAction);
}
}
diff --git a/protocols/p4runtime/model/src/test/java/org/onosproject/p4runtime/model/P4PipelineModelTest.java b/protocols/p4runtime/model/src/test/java/org/onosproject/p4runtime/model/P4PipelineModelTest.java
index 8576e84..4723ea5 100644
--- a/protocols/p4runtime/model/src/test/java/org/onosproject/p4runtime/model/P4PipelineModelTest.java
+++ b/protocols/p4runtime/model/src/test/java/org/onosproject/p4runtime/model/P4PipelineModelTest.java
@@ -271,20 +271,17 @@
private static final boolean SUPPORT_AGING_1 = true;
private static final boolean SUPPORT_AGING_2 = false;
- private static final boolean HAS_DEFAULT_MUTABLE_PARAMS_1 = true;
- private static final boolean HAS_DEFAULT_MUTABLE_PARAMS_2 = false;
-
private static final boolean IS_CONST_TABLE_1 = true;
private static final boolean IS_CONST_TABLE_2 = false;
private static final PiTableModel P4_TABLE_MODEL_1 =
new P4TableModel(PI_TABLE_ID_1, PI_TABLE_TYPE_1, P4_ACTION_PROFILE_MODEL_1, MAX_SIZE_1, COUNTERS_1,
METERS_1, SUPPORT_AGING_1, MATCH_FIELDS_1, ACTIONS_1, P4_ACTION_MODEL_DEFAULT_1,
- HAS_DEFAULT_MUTABLE_PARAMS_1, IS_CONST_TABLE_1);
+ IS_CONST_TABLE_1);
private static final PiTableModel P4_TABLE_MODEL_2 =
new P4TableModel(PI_TABLE_ID_2, PI_TABLE_TYPE_2, P4_ACTION_PROFILE_MODEL_2, MAX_SIZE_2, COUNTERS_2,
METERS_2, SUPPORT_AGING_2, MATCH_FIELDS_2, ACTIONS_2, P4_ACTION_MODEL_DEFAULT_2,
- HAS_DEFAULT_MUTABLE_PARAMS_2, IS_CONST_TABLE_2);
+ IS_CONST_TABLE_2);
/* Packet operations */
private static final PiPacketOperationType PI_PACKET_OPERATION_TYPE_1 = PiPacketOperationType.PACKET_IN;
diff --git a/protocols/p4runtime/model/src/test/java/org/onosproject/p4runtime/model/P4TableModelTest.java b/protocols/p4runtime/model/src/test/java/org/onosproject/p4runtime/model/P4TableModelTest.java
index 797abe4..13677c0 100644
--- a/protocols/p4runtime/model/src/test/java/org/onosproject/p4runtime/model/P4TableModelTest.java
+++ b/protocols/p4runtime/model/src/test/java/org/onosproject/p4runtime/model/P4TableModelTest.java
@@ -244,24 +244,21 @@
private static final boolean SUPPORT_AGING_1 = true;
private static final boolean SUPPORT_AGING_2 = false;
- private static final boolean HAS_DEFAULT_MUTABLE_PARAMS_1 = true;
- private static final boolean HAS_DEFAULT_MUTABLE_PARAMS_2 = false;
-
private static final boolean IS_CONST_TABLE_1 = true;
private static final boolean IS_CONST_TABLE_2 = false;
private static final PiTableModel P4_TABLE_MODEL_1 =
new P4TableModel(PI_TABLE_ID_1, PI_TABLE_TYPE_1, P4_ACTION_PROFILE_MODEL_1, MAX_SIZE_1, COUNTERS_1,
METERS_1, SUPPORT_AGING_1, MATCH_FIELDS_1, ACTIONS_1, P4_ACTION_MODEL_DEFAULT_1,
- HAS_DEFAULT_MUTABLE_PARAMS_1, IS_CONST_TABLE_1);
+ IS_CONST_TABLE_1);
private static final PiTableModel SAME_AS_P4_TABLE_MODEL_1 =
new P4TableModel(PI_TABLE_ID_1, PI_TABLE_TYPE_1, P4_ACTION_PROFILE_MODEL_1, MAX_SIZE_1, COUNTERS_1,
METERS_1, SUPPORT_AGING_1, MATCH_FIELDS_1, ACTIONS_1, P4_ACTION_MODEL_DEFAULT_1,
- HAS_DEFAULT_MUTABLE_PARAMS_1, IS_CONST_TABLE_1);
+ IS_CONST_TABLE_1);
private static final PiTableModel P4_TABLE_MODEL_2 =
new P4TableModel(PI_TABLE_ID_2, PI_TABLE_TYPE_2, P4_ACTION_PROFILE_MODEL_2, MAX_SIZE_2, COUNTERS_2,
METERS_2, SUPPORT_AGING_2, MATCH_FIELDS_2, ACTIONS_2, P4_ACTION_MODEL_DEFAULT_2,
- HAS_DEFAULT_MUTABLE_PARAMS_2, IS_CONST_TABLE_2);
+ IS_CONST_TABLE_2);
/**
* Checks that the P4TableModel class is immutable.