commit c86750e4a8dd357dcc58f940f6ccad9f6bd7c714
author slowr <mavromat@csd.uoc.gr> Tue Aug 22 17:26:47 2017 -0700
committer slowr <mavromat@csd.uoc.gr> Tue Aug 22 17:26:47 2017 -0700
tree 70f8c53fec0c01e1acb78f49c6cc668a2d9eb176
parent d337c93339acfcf5233fc74fd93593ca5636f7ac

introduced xran UE context ID

src/main/java/org.onosproject.xran/identifiers/LinkId.java

diff --git a/src/main/java/org.onosproject.xran/identifiers/LinkId.java b/src/main/java/org.onosproject.xran/identifiers/LinkId.java
index 8b7dabb..e2b489a 100644
--- a/src/main/java/org.onosproject.xran/identifiers/LinkId.java
+++ b/src/main/java/org.onosproject.xran/identifiers/LinkId.java
@@ -21,13 +21,12 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import org.onosproject.xran.codecs.api.ECGI;
-import org.onosproject.xran.codecs.api.MMEUES1APID;
 import org.onosproject.xran.entities.RnibCell;
 import org.onosproject.xran.entities.RnibUe;
 
 @JsonPropertyOrder({
         "ECGI",
-        "MMEUES1APID"
+        "UEID"
 })
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class LinkId {
@@ -45,12 +44,12 @@
         return new LinkId(cell, ue);
     }
 
-    public static LinkId valueOf(ECGI ecgi, MMEUES1APID mmeues1APID) {
+    public static LinkId valueOf(ECGI ecgi, Long UeId) {
         RnibCell cell = new RnibCell();
         RnibUe ue = new RnibUe();
 
         cell.setEcgi(ecgi);
-        ue.setMmeS1apId(mmeues1APID);
+        ue.setId(UeId);
         return new LinkId(cell, ue);
     }
 
@@ -64,14 +63,14 @@
         cell.setEcgi(sourceId);
     }
 
-    @JsonProperty("MMEUES1APID")
-    public MMEUES1APID getMmeues1apid() {
-        return ue.getMmeS1apId();
+    @JsonProperty("UEID")
+    public Long getUeId() {
+        return ue.getId();
     }
 
-    @JsonProperty("MMEUES1APID")
-    public void setMmeues1apid(MMEUES1APID destinationId) {
-        ue.setMmeS1apId(destinationId);
+    @JsonProperty("UEID")
+    public void setUeId(Long destinationId) {
+        ue.setId(destinationId);
     }
 
     @JsonIgnore
@@ -100,14 +99,14 @@
                 o != null &&
                         o instanceof LinkId &&
                         cell.getEcgi().equals(((LinkId) o).cell.getEcgi()) &&
-                        ue.getMmeS1apId().equals(((LinkId) o).ue.getMmeS1apId());
+                        ue.getId().equals(((LinkId) o).ue.getId());
 
     }
 
     @Override
     public int hashCode() {
         int result = cell.getEcgi().hashCode();
-        result = 31 * result + ue.getMmeS1apId().hashCode();
+        result = 31 * result + ue.getId().hashCode();
         return result;
     }