Removed non-standard TLVs. Added extra tests

telefonicaid · Jan 25, 2021 · 8b6944b · 8b6944b
1 parent 55a30f6
commit 8b6944b
Show file tree

Hide file tree

Showing 10 changed files with 207 additions and 665 deletions.
diff --git a/src/main/java/es/tid/ospf/ospfv2/lsa/tlv/LinkTLV.java b/src/main/java/es/tid/ospf/ospfv2/lsa/tlv/LinkTLV.java
@@ -464,12 +464,14 @@ public void setRemoteASNumber(RemoteASNumber remoteASNumber) {
 		//this.remoteASNumber = remoteASNumber;
 	}
 
-	public IPv4RemoteASBRID getiPv4RemoteASBRID() {
+
+	public IPv4RemoteASBRID getIPv4RemoteASBRID() {
 		return iPv4RemoteASBRID;
 	}
 
+
 	public void setIPv4RemoteASBRID(IPv4RemoteASBRID iPv4RemoteASBRID) {
-		//this.iPv4RemoteASBRID = iPv4RemoteASBRID;
+		this.iPv4RemoteASBRID = iPv4RemoteASBRID;
 	}
 
 	public String toString(){
@@ -571,4 +573,6 @@ public String printShort(){
 
 		return sb.toString();
 	}
+
+
 }
diff --git a/src/main/java/es/tid/ospf/ospfv2/lsa/tlv/OSPFTLV.java b/src/main/java/es/tid/ospf/ospfv2/lsa/tlv/OSPFTLV.java
@@ -1,5 +1,7 @@
 package es.tid.ospf.ospfv2.lsa.tlv;
 
+import java.util.Arrays;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,6 +42,39 @@ length field (so a three octet value would have a length of three,
  */
 public abstract class OSPFTLV {
 
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + TLVType;
+		result = prime * result + TLVValueLength;
+		result = prime * result + TotalTLVLength;
+		result = prime * result + Arrays.hashCode(tlv_bytes);
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		OSPFTLV other = (OSPFTLV) obj;
+		if (TLVType != other.TLVType)
+			return false;
+		if (TLVValueLength != other.TLVValueLength)
+			return false;
+		if (TotalTLVLength != other.TotalTLVLength)
+			return false;
+		if (!Arrays.equals(tlv_bytes, other.tlv_bytes))
+			return false;
+		return true;
+	}
+
+
+
 	/**
 	 * Type of the OSPF TLV
 	 */

diff --git a/src/main/java/es/tid/pce/pcep/constructs/EndPoint.java b/src/main/java/es/tid/pce/pcep/constructs/EndPoint.java
@@ -1,15 +1,5 @@
 package es.tid.pce.pcep.constructs;
 
-import es.tid.pce.pcep.PCEPProtocolViolationException;
-import es.tid.pce.pcep.objects.MalformedPCEPObjectException;
-import es.tid.pce.pcep.objects.ObjectParameters;
-import es.tid.pce.pcep.objects.tlvs.EndPointDataPathTLV;
-import es.tid.pce.pcep.objects.tlvs.EndPointUnnumberedDataPathTLV;
-import es.tid.pce.pcep.objects.tlvs.EndPointIPv4TLV;
-import es.tid.pce.pcep.objects.tlvs.PCEPTLV;
-import es.tid.pce.pcep.objects.tlvs.UnnumberedEndpointTLV;
-import es.tid.pce.pcep.objects.tlvs.XifiEndPointTLV;
-
 public abstract class EndPoint extends PCEPConstruct {
 
 	public EndPoint() {

diff --git a/src/main/java/es/tid/pce/pcep/constructs/UnnumIfEndPoint.java b/src/main/java/es/tid/pce/pcep/constructs/UnnumIfEndPoint.java
@@ -5,10 +5,8 @@
 import es.tid.pce.pcep.objects.ObjectParameters;
 import es.tid.pce.pcep.objects.tlvs.EndPointDataPathTLV;
 import es.tid.pce.pcep.objects.tlvs.EndPointIPv4TLV;
-import es.tid.pce.pcep.objects.tlvs.EndPointUnnumberedDataPathTLV;
 import es.tid.pce.pcep.objects.tlvs.PCEPTLV;
 import es.tid.pce.pcep.objects.tlvs.UnnumberedEndpointTLV;
-import es.tid.pce.pcep.objects.tlvs.XifiEndPointTLV;
 
 public class UnnumIfEndPoint extends EndPoint {
 

diff --git a/src/main/java/es/tid/pce/pcep/objects/tlvs/EndPointUnnumberedDataPathTLV.java b/src/main/java/es/tid/pce/pcep/objects/tlvs/EndPointUnnumberedDataPathTLV.java