[ONOS-7731] Add unit tests for openstack vtap and vtapCriterion
Change-Id: I9ff749a5e179aef9fb86a96f651400d929a9f3c7
diff --git a/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/DefaultOpenstackVtap.java b/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/DefaultOpenstackVtap.java
index 7e51be5..d5c842f 100644
--- a/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/DefaultOpenstackVtap.java
+++ b/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/DefaultOpenstackVtap.java
@@ -93,28 +93,24 @@
@Override
public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- id,
- type,
- vTapCriterion,
- txDeviceIds,
- rxDeviceIds);
+ return Objects.hashCode(id, type, vTapCriterion, txDeviceIds, rxDeviceIds);
}
@Override
- public boolean equals(Object object) {
- if (object != null && getClass() == object.getClass()) {
- if (!super.equals(object)) {
- return false;
- }
- DefaultOpenstackVtap that = (DefaultOpenstackVtap) object;
- return Objects.equal(this.id, that.id)
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ DefaultOpenstackVtap that = (DefaultOpenstackVtap) o;
+ return Objects.equal(this.id, that.id)
&& Objects.equal(this.type, that.type)
&& Objects.equal(this.vTapCriterion, that.vTapCriterion)
&& Objects.equal(this.txDeviceIds, that.txDeviceIds)
&& Objects.equal(this.rxDeviceIds, that.rxDeviceIds);
- }
- return false;
}
/**
diff --git a/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/DefaultOpenstackVtapCriterion.java b/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/DefaultOpenstackVtapCriterion.java
index ef8f08f..d53bf25 100644
--- a/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/DefaultOpenstackVtapCriterion.java
+++ b/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/DefaultOpenstackVtapCriterion.java
@@ -86,29 +86,24 @@
@Override
public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- srcIpPrefix,
- dstIpPrefix,
- ipProtocol,
- srcTpPort,
- dstTpPort);
+ return Objects.hashCode(srcIpPrefix, dstIpPrefix,
+ ipProtocol, srcTpPort, dstTpPort);
}
@Override
- public boolean equals(Object object) {
- if (object != null && getClass() == object.getClass()) {
- if (!super.equals(object)) {
- return false;
- }
-
- DefaultOpenstackVtapCriterion that = (DefaultOpenstackVtapCriterion) object;
- return Objects.equal(this.srcIpPrefix, that.srcIpPrefix) &&
- Objects.equal(this.dstIpPrefix, that.dstIpPrefix) &&
- Objects.equal(this.ipProtocol, that.ipProtocol) &&
- Objects.equal(this.srcTpPort, that.srcTpPort) &&
- Objects.equal(this.dstTpPort, that.dstTpPort);
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
}
- return false;
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ DefaultOpenstackVtapCriterion that = (DefaultOpenstackVtapCriterion) o;
+ return Objects.equal(this.srcIpPrefix, that.srcIpPrefix) &&
+ Objects.equal(this.dstIpPrefix, that.dstIpPrefix) &&
+ Objects.equal(this.ipProtocol, that.ipProtocol) &&
+ Objects.equal(this.srcTpPort, that.srcTpPort) &&
+ Objects.equal(this.dstTpPort, that.dstTpPort);
}
/**
diff --git a/apps/openstackvtap/app/src/test/java/org/onosproject/openstackvtap/impl/DefaultOpenstackVtapCriterionTest.java b/apps/openstackvtap/app/src/test/java/org/onosproject/openstackvtap/impl/DefaultOpenstackVtapCriterionTest.java
new file mode 100644
index 0000000..048a652
--- /dev/null
+++ b/apps/openstackvtap/app/src/test/java/org/onosproject/openstackvtap/impl/DefaultOpenstackVtapCriterionTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+ *
+ * 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.openstackvtap.impl;
+
+import com.google.common.testing.EqualsTester;
+import org.junit.Before;
+import org.junit.Test;
+import org.onlab.packet.IpAddress;
+import org.onlab.packet.IpPrefix;
+import org.onlab.packet.TpPort;
+import org.onosproject.openstackvtap.api.OpenstackVtapCriterion;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+/**
+ * Unit tests for DefaultOpenstackVtapCriterion.
+ */
+public class DefaultOpenstackVtapCriterionTest {
+
+ private static final IpPrefix SRC_IP_PREFIX_1 =
+ IpPrefix.valueOf(IpAddress.valueOf("10.10.10.1"), 32);
+ private static final IpPrefix SRC_IP_PREFIX_2 =
+ IpPrefix.valueOf(IpAddress.valueOf("20.20.20.1"), 32);
+ private static final IpPrefix DST_IP_PREFIX_1 =
+ IpPrefix.valueOf(IpAddress.valueOf("10.10.10.2"), 32);
+ private static final IpPrefix DST_IP_PREFIX_2 =
+ IpPrefix.valueOf(IpAddress.valueOf("20.20.20.2"), 32);
+
+ private static final TpPort SRC_PORT_1 = TpPort.tpPort(10);
+ private static final TpPort SRC_PORT_2 = TpPort.tpPort(20);
+ private static final TpPort DST_PORT_1 = TpPort.tpPort(30);
+ private static final TpPort DST_PORT_2 = TpPort.tpPort(40);
+
+ private static final byte IP_PROTOCOL_1 = (byte) 1;
+ private static final byte IP_PROTOCOL_2 = (byte) 2;
+
+ private OpenstackVtapCriterion criterion1;
+ private OpenstackVtapCriterion sameAsCriterion1;
+ private OpenstackVtapCriterion criterion2;
+
+ @Before
+ public void setup() {
+
+ OpenstackVtapCriterion.Builder builder1 = DefaultOpenstackVtapCriterion.builder();
+
+ criterion1 = builder1
+ .srcIpPrefix(SRC_IP_PREFIX_1)
+ .dstIpPrefix(DST_IP_PREFIX_1)
+ .srcTpPort(SRC_PORT_1)
+ .dstTpPort(DST_PORT_1)
+ .ipProtocol(IP_PROTOCOL_1)
+ .build();
+
+ OpenstackVtapCriterion.Builder builder2 = DefaultOpenstackVtapCriterion.builder();
+
+ sameAsCriterion1 = builder2
+ .srcIpPrefix(SRC_IP_PREFIX_1)
+ .dstIpPrefix(DST_IP_PREFIX_1)
+ .srcTpPort(SRC_PORT_1)
+ .dstTpPort(DST_PORT_1)
+ .ipProtocol(IP_PROTOCOL_1)
+ .build();
+
+ OpenstackVtapCriterion.Builder builder3 = DefaultOpenstackVtapCriterion.builder();
+
+ criterion2 = builder3
+ .srcIpPrefix(SRC_IP_PREFIX_2)
+ .dstIpPrefix(DST_IP_PREFIX_2)
+ .srcTpPort(SRC_PORT_2)
+ .dstTpPort(DST_PORT_2)
+ .ipProtocol(IP_PROTOCOL_2)
+ .build();
+ }
+
+ @Test
+ public void testEquality() {
+ new EqualsTester()
+ .addEqualityGroup(criterion1, sameAsCriterion1)
+ .addEqualityGroup(criterion2).testEquals();
+ }
+
+ @Test
+ public void testConstruction() {
+ DefaultOpenstackVtapCriterion criterion =
+ (DefaultOpenstackVtapCriterion) criterion1;
+
+ assertThat(criterion.srcIpPrefix(), is(SRC_IP_PREFIX_1));
+ assertThat(criterion.dstIpPrefix(), is(DST_IP_PREFIX_1));
+ assertThat(criterion.srcTpPort(), is(SRC_PORT_1));
+ assertThat(criterion.dstTpPort(), is(DST_PORT_1));
+ assertThat(criterion.ipProtocol(), is(IP_PROTOCOL_1));
+ }
+}
diff --git a/apps/openstackvtap/app/src/test/java/org/onosproject/openstackvtap/impl/DefaultOpenstackVtapTest.java b/apps/openstackvtap/app/src/test/java/org/onosproject/openstackvtap/impl/DefaultOpenstackVtapTest.java
new file mode 100644
index 0000000..fd9fbf5
--- /dev/null
+++ b/apps/openstackvtap/app/src/test/java/org/onosproject/openstackvtap/impl/DefaultOpenstackVtapTest.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+ *
+ * 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.openstackvtap.impl;
+
+import com.google.common.collect.Sets;
+import com.google.common.testing.EqualsTester;
+import org.junit.Before;
+import org.junit.Test;
+import org.onlab.packet.IpAddress;
+import org.onlab.packet.IpPrefix;
+import org.onlab.packet.TpPort;
+import org.onosproject.openstackvtap.api.OpenstackVtap;
+import org.onosproject.openstackvtap.api.OpenstackVtapCriterion;
+import org.onosproject.openstackvtap.api.OpenstackVtapId;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+/**
+ * Unit tests for DefaultOpenstackVtap.
+ */
+public class DefaultOpenstackVtapTest {
+
+ private static final OpenstackVtapId VTAP_ID_1 = OpenstackVtapId.vTapId();
+ private static final OpenstackVtapId VTAP_ID_2 = OpenstackVtapId.vTapId();
+
+ private static final OpenstackVtap.Type VTAP_TYPE_1 = OpenstackVtap.Type.VTAP_TX;
+ private static final OpenstackVtap.Type VTAP_TYPE_2 = OpenstackVtap.Type.VTAP_RX;
+
+ private static final IpPrefix SRC_IP_PREFIX_1 =
+ IpPrefix.valueOf(IpAddress.valueOf("10.10.10.1"), 32);
+ private static final IpPrefix SRC_IP_PREFIX_2 =
+ IpPrefix.valueOf(IpAddress.valueOf("20.20.20.1"), 32);
+ private static final IpPrefix DST_IP_PREFIX_1 =
+ IpPrefix.valueOf(IpAddress.valueOf("10.10.10.2"), 32);
+ private static final IpPrefix DST_IP_PREFIX_2 =
+ IpPrefix.valueOf(IpAddress.valueOf("20.20.20.2"), 32);
+
+ private static final TpPort SRC_PORT_1 = TpPort.tpPort(10);
+ private static final TpPort SRC_PORT_2 = TpPort.tpPort(20);
+ private static final TpPort DST_PORT_1 = TpPort.tpPort(30);
+ private static final TpPort DST_PORT_2 = TpPort.tpPort(40);
+
+ private static final byte IP_PROTOCOL_1 = (byte) 1;
+ private static final byte IP_PROTOCOL_2 = (byte) 2;
+
+ private static final OpenstackVtapCriterion CRITERION_1 =
+ createVtapCriterion(SRC_IP_PREFIX_1, DST_IP_PREFIX_1, SRC_PORT_1, DST_PORT_1, IP_PROTOCOL_1);
+ private static final OpenstackVtapCriterion CRITERION_2 =
+ createVtapCriterion(SRC_IP_PREFIX_2, DST_IP_PREFIX_2, SRC_PORT_2, DST_PORT_2, IP_PROTOCOL_2);
+
+ private OpenstackVtap vtap1;
+ private OpenstackVtap sameAsVtap1;
+ private OpenstackVtap vtap2;
+
+ @Before
+ public void setup() {
+
+ OpenstackVtap.Builder builder1 = DefaultOpenstackVtap.builder();
+
+ vtap1 = builder1
+ .id(VTAP_ID_1)
+ .type(VTAP_TYPE_1)
+ .vTapCriterion(CRITERION_1)
+ .txDeviceIds(Sets.newHashSet())
+ .rxDeviceIds(Sets.newHashSet())
+ .annotations()
+ .build();
+
+ OpenstackVtap.Builder builder2 = DefaultOpenstackVtap.builder();
+
+ sameAsVtap1 = builder2
+ .id(VTAP_ID_1)
+ .type(VTAP_TYPE_1)
+ .vTapCriterion(CRITERION_1)
+ .txDeviceIds(Sets.newHashSet())
+ .rxDeviceIds(Sets.newHashSet())
+ .annotations()
+ .build();
+
+ OpenstackVtap.Builder builder3 = DefaultOpenstackVtap.builder();
+
+ vtap2 = builder3
+ .id(VTAP_ID_2)
+ .type(VTAP_TYPE_2)
+ .vTapCriterion(CRITERION_2)
+ .txDeviceIds(Sets.newHashSet())
+ .rxDeviceIds(Sets.newHashSet())
+ .annotations()
+ .build();
+
+ }
+
+ @Test
+ public void testEquality() {
+ new EqualsTester()
+ .addEqualityGroup(vtap1, sameAsVtap1)
+ .addEqualityGroup(vtap2).testEquals();
+ }
+
+ @Test
+ public void testConstruction() {
+ DefaultOpenstackVtap vtap = (DefaultOpenstackVtap) vtap1;
+
+ assertThat(vtap.id(), is(VTAP_ID_1));
+ assertThat(vtap.vTapCriterion(), is(CRITERION_1));
+ assertThat(vtap.type(), is(VTAP_TYPE_1));
+ }
+
+ private static OpenstackVtapCriterion createVtapCriterion(IpPrefix srcIp, IpPrefix dstIp,
+ TpPort srcPort, TpPort dstPort,
+ byte ipProtocol) {
+ return DefaultOpenstackVtapCriterion.builder()
+ .srcIpPrefix(srcIp)
+ .dstIpPrefix(dstIp)
+ .srcTpPort(srcPort)
+ .dstTpPort(dstPort)
+ .ipProtocol(ipProtocol)
+ .build();
+ }
+}