Replace references to trueCall with "ran/RAN"

Author: ajay-gov

src/main/java/swim/cellular/agent/ENodeBAgent.java

@@ -37,25 +37,25 @@ public class ENodeBAgent extends AbstractAgent {
   ValueLane<Value> status;
 
   /**
-   * Computed kpis from TrueCall data for this cell site.
+   * Computed kpis from RAN data for this cell site.
    */
   @SwimLane("kpis")
   ValueLane<Value> kpis;
 
   /**
-   * Latest TrueCall data for this cell site, updated by a simulator or other
+   * Latest RAN data for this cell site, updated by a simulator or other
    * driver agent running in the same Swim Node as this eNodeB agent.
    */
-  @SwimLane("trueCallLatest")
-  ValueLane<Value> trueCallLatest = this.<Value>valueLane()
-      .didSet(this::didSetTrueCallLatest);
+  @SwimLane("ranLatest")
+  ValueLane<Value> ranLatest = this.<Value>valueLane()
+      .didSet(this::didSetRanLatest);
 
   /**
-   * Rolling time series of historical TrueCall samples.
+   * Rolling time series of historical ran samples.
    */
-  @SwimLane("trueCallHistory")
-  MapLane<Long, Value> trueCallHistory = this.<Long, Value>mapLane()
-      .didUpdate(this::didUpdateTrueCallHistory);
+  @SwimLane("ranHistory")
+  MapLane<Long, Value> ranHistory = this.<Long, Value>mapLane()
+      .didUpdate(this::didUpdateRanHistory);
 
   @SwimLane("summary")
   HttpLane<Value> summary = this.<Value>httpLane()
@@ -76,35 +76,35 @@ HttpResponse<?> onRequestSummary(HttpRequest<Value> request) {
   }
 
   /**
-   * Invoked when new TrueCall data is received.
+   * Invoked when new ran data is received.
    */
-  void didSetTrueCallLatest(Value newSample, Value oldSample) {
-    // Extract the recorded timestamp from the TrueCall sample.
+  void didSetRanLatest(Value newSample, Value oldSample) {
+    // Extract the recorded timestamp from the RAN sample.
     final long timestamp = newSample.get("recorded_time").longValue();
-    // Record this sample in the TrueCall history lane.
-    this.trueCallHistory.put(timestamp, newSample);
-    // Update TrueCall KPIs to account foe the newly received sample.
+    // Record this sample in the RAN history lane.
+    this.ranHistory.put(timestamp, newSample);
+    // Update RAN KPIs to account for the newly received sample.
     updateKpis(newSample);
   }
 
   /**
-   * Invoked when a new sample is added to the TrueCall history lane.
+   * Invoked when a new sample is added to the RAN history lane.
    */
-  void didUpdateTrueCallHistory(Long timestamp, Value newSample, Value oldSample) {
-    // Check if the size of the TrueCall history lane exceeds 10 samples,
+  void didUpdateRanHistory(Long timestamp, Value newSample, Value oldSample) {
+    // Check if the size of the RAN history lane exceeds 10 samples,
     // and drop the oldest excess samples.
-    final int dropCount = this.trueCallHistory.size() - 10;
+    final int dropCount = this.ranHistory.size() - 10;
     if (dropCount > 0) {
-      this.trueCallHistory.drop(dropCount);
+      this.ranHistory.drop(dropCount);
     }
   }
 
   /**
-   * Updates TrueCall KPIs with a newly received TrueCall sample.
+   * Updates RAN KPIs with a newly received RAN sample.
    */
   void updateKpis(Value newSample) {
     final Value oldKpis = this.kpis.get();
-    // Get the previous number of TrueCall samples received, initializing to 0.
+    // Get the previous number of RAN samples received, initializing to 0.
     final int oldCount = oldKpis.get("count").intValue(0);
 
     // Compute running avergae of mean ul sinr;

src/main/java/swim/cellular/agent/ENodeBConnectorAgent.java

@@ -18,12 +18,12 @@ public class ENodeBConnectorAgent extends AbstractAgent {
   private ValueDownlink<Value> statusDownlink;
 
   /**
-   * A downlink to the trueCallLatest lane of the EnodeBAgent (whose uri is the
+   * A downlink to the ranLatest lane of the EnodeBAgent (whose uri is the
    * same as this agent) hosted on cellular.swim.services. The downlink updates
-   * whenever the trueCallLatest lane of the EnodeBAgenthosted on
+   * whenever the ranLatest lane of the EnodeBAgent hosted on
    * cellular.swim.services is updated
    */
-  private ValueDownlink<Value> trueCallLatestDownlink;
+  private ValueDownlink<Value> ranLatestDownlink;
 
   /**
    * Cell site status lane updated by the downlink to the status lane
@@ -35,13 +35,13 @@ public class ENodeBConnectorAgent extends AbstractAgent {
   ValueLane<Value> status;
 
   /**
-   * Latest trueCall data for a cell site updated by the downlink to the
-   * trueCallLatest lane of the EnodeBAgent hosted on cellular.swim.services,
+   * Latest RAN data for a cell site updated by the downlink to the
+   * ranLatest lane of the EnodeBAgent hosted on cellular.swim.services,
    * shared with the cell site and eNodeB agents running in the same Swim Node
    * as this connector agent.
    */
-  @SwimLane("trueCallLatest")
-  ValueLane<Value> trueCallLatest;
+  @SwimLane("ranLatest")
+  ValueLane<Value> ranLatest;
 
   /**
    * Invoked when new new status data is received from the remote agent
@@ -51,10 +51,10 @@ private void didUpdateStatus(Value newStatus, Value oldStatus) {
   }
 
   /**
-   * Invoked when new new trueCall sample data is received from the remote agent
+   * Invoked when new new ran sample data is received from the remote agent
    */
-  private void didUpdateTrueCallLatest(Value newSample, Value oldSample) {
-    this.trueCallLatest.set(newSample);
+  private void didUpdateRanLatest(Value newSample, Value oldSample) {
+    this.ranLatest.set(newSample);
   }
 
   /**
@@ -72,13 +72,13 @@ public void didStart() {
         .open()
         .didSet(this::didUpdateStatus);
 
-    // Instantiate the trueCallLatestDownlink
-    trueCallLatestDownlink = downlinkValue()
+    // Instantiate the ranLatestDownlink
+    ranLatestDownlink = downlinkValue()
         .hostUri(REMOTE_HOST_URI)
         .nodeUri(nodeUri()) // convenience method to get the current agent's URI
-        .laneUri("trueCallLatest")
+        .laneUri("ranLatest")
         .open()
-        .didSet(this::didUpdateTrueCallLatest);
+        .didSet(this::didUpdateRanLatest);
   }
 
   /**
@@ -91,9 +91,9 @@ public void willStop() {
       statusDownlink.close();
     }
 
-    // close the trueCallLatestDownlink
-    if (trueCallLatest != null) {
-      trueCallLatest.close();
+    // close the ranLatestDownlink
+    if (ranLatest != null) {
+      ranLatest.close();
     }
   }
 

src/main/java/swim/cellular/agent/ENodeBSimAgent.java

@@ -2,10 +2,8 @@
 
 import swim.api.SwimLane;
 import swim.api.agent.AbstractAgent;
-import swim.api.lane.MapLane;
 import swim.api.lane.ValueLane;
 import swim.concurrent.TimerRef;
-import swim.observable.function.DidUpdateKey;
 import swim.structure.Record;
 import swim.structure.Value;
 
@@ -28,12 +26,12 @@ public class ENodeBSimAgent extends AbstractAgent {
   ValueLane<Value> status;
 
   /**
-   * Latest trueCall data for a cell site updated by the simulation, shared
+   * Latest RAN data for a cell site updated by the simulation, shared
    * with the cell site and eNodeB agents running in the same Swim Node as
    * this sim agent.
    */
-  @SwimLane("trueCallLatest")
-  ValueLane<Value> trueCallLatest;
+  @SwimLane("ranLatest")
+  ValueLane<Value> ranLatest;
 
   /**
    * Runs a single step of the eNodeB simulation.
@@ -65,14 +63,14 @@ void onSimTick() {
     // Generate a random rrc re-establishment failure count between 1 and 9.
     final long rrcReestablishmentFailures = (long) (1 + Math.random() * 9);
 
-    // Update this eNodeB's trueCallLatest lane with the simulated data.
-    final Value oldTrueCallLatest = this.trueCallLatest.get();
-    final Value newTrueCallLatest = oldTrueCallLatest
+    // Update this eNodeB's ranLatest lane with the simulated data.
+    final Value oldRanLatest = this.ranLatest.get();
+    final Value newRanLatest = oldRanLatest
         .updated("mean_ul_sinr", meanUlSinr)
         .updated("rrc_re_establishment_failures", rrcReestablishmentFailures)
         .updated("recorded_time", System.currentTimeMillis());
-    this.trueCallLatest.set(newTrueCallLatest);
-    trace(Record.of("simulated true call sample", newTrueCallLatest));
+    this.ranLatest.set(newRanLatest);
+    trace(Record.of("simulated RAN sample", newRanLatest));
   }
 
   /**

src/main/resources/server-c.recon

@@ -0,0 +1,38 @@
+@kernel(class: "swim.store.db.DbStoreKernel", optional: true)
+@kernel(class: "swim.cellular.CellularUiRouter")
+
+@web(port: 9009) {
+  space: "cellular"
+  @websocket {
+    serverCompressionLevel: 0# -1 = default; 0 = off; 1-9 = deflate level
+    clientCompressionLevel: 0# -1 = default; 0 = off; 1-9 = deflate level
+  }
+}
+
+cellular: @fabric {
+  @node {
+    pattern: "/site/:id"
+    @agent(class: "swim.cellular.agent.SiteAgent")
+  }
+
+  @node {
+    uri: "/country/US/state/:id"
+    @agent(class: "swim.cellular.agent.RegionAgent") {
+      seed: "seed/country/US/state/CA.recon"
+    }
+    @agent(class: "swim.cellular.agent.RanAgent") {
+      seed: "seed/country/US/state/CA-ran.recon"
+    }
+  }
+
+  @node {
+    uri: "/country/:id"
+    @agent(class: "swim.cellular.agent.RegionAgent") {
+      seed: "seed/country/US.recon"
+    }
+  }
+
+  #@store {
+  #  path: "/tmp/swim-cellular/"
+  #}
+}