Generic ROADM port models and descriptions

Change-Id: I053d61c7a057d6298b7990373448df28b3aaa5a5
diff --git a/core/api/src/main/java/org/onosproject/net/DefaultPort.java b/core/api/src/main/java/org/onosproject/net/DefaultPort.java
index 35c02d3..a6b8441 100644
--- a/core/api/src/main/java/org/onosproject/net/DefaultPort.java
+++ b/core/api/src/main/java/org/onosproject/net/DefaultPort.java
@@ -64,7 +64,6 @@
         this.isEnabled = isEnabled;
         this.type = type;
         this.portSpeed = portSpeed;
-
     }
 
     @Override
@@ -94,7 +93,7 @@
 
     @Override
     public int hashCode() {
-        return Objects.hash(number, isEnabled, type, portSpeed);
+        return Objects.hash(number, isEnabled, type, portSpeed, annotations());
     }
 
     @Override
@@ -108,7 +107,8 @@
                     Objects.equals(this.number, other.number) &&
                     Objects.equals(this.isEnabled, other.isEnabled) &&
                     Objects.equals(this.type, other.type) &&
-                    Objects.equals(this.portSpeed, other.portSpeed);
+                    Objects.equals(this.portSpeed, other.portSpeed) &&
+                    Objects.equals(this.annotations(), other.annotations());
         }
         return false;
     }