Merge branch 'opennetworkinglab:master' into master

Author: hussainahmadmo

.gitmodules

@@ -22,3 +22,7 @@
 	path = deps/sdran
 	url = https://github.com/opennetworkinglab/aether-sdran.git
 	branch = master
+[submodule "deps/ueransim"]
+	path = deps/ueransim
+	url = https://github.com/opennetworkinglab/aether-ueransim.git
+	branch = master

Makefile

@@ -8,6 +8,7 @@ export 5GC_ROOT_DIR ?= $(AETHER_ROOT_DIR)/deps/5gc
 export 4GC_ROOT_DIR ?= $(AETHER_ROOT_DIR)/deps/4gc
 export AMP_ROOT_DIR ?= $(AETHER_ROOT_DIR)/deps/amp
 export GNBSIM_ROOT_DIR ?= $(AETHER_ROOT_DIR)/deps/gnbsim
+export UERANSIM_ROOT_DIR ?= $(AETHER_ROOT_DIR)/deps/ueransim
 export K8S_ROOT_DIR ?= $(AETHER_ROOT_DIR)/deps/k8s
 
 export ANSIBLE_NAME ?= ansible-aether
@@ -40,6 +41,8 @@ aether-amp-install: amp-install
 aether-amp-uninstall: amp-uninstall
 aether-sdran-install: sdran-install
 aether-sdran-uninstall: sdran-uninstall
+aether-ueransim-install: ueransim-install
+aether-ueransim-uninstall: ueransim-uninstall
 
 #### Shortcut for QuickStart Only ####
 aether-install: k8s-install 5gc-install gnbsim-install amp-install
@@ -56,6 +59,7 @@ aether-reset4gcore: 4gc-core-uninstall 4gc-core-install
 aether-gnbsim-run: gnbsim-simulator-run
 aether-add-upfs: 5gc-upf-install
 aether-remove-upfs: 5gc-upf-uninstall
+aether-ueransim-run: ueransim-run
 
 # Rules:
 #	amp-install: roc-install roc-load monitor-install monitor-load
@@ -85,17 +89,17 @@ aether-remove-upfs: 5gc-upf-uninstall
 # amp-install: k8s-install roc-install roc-load monitor-install monitor-load
 # amp-uninstall: monitor-uninstall roc-uninstall k8s-uninstall
 
-### Provision ROC ###
+### Provision and load ROC ###
 # roc-install
 # roc-load
 # roc-uninstall
 
-### Provision Monitoring ###
+### Provision and load Monitoring ###
 # monitor-install
 # monitor-load
 # monitor-uninstall
 
-### Provision gnbsim ###
+### Provision and run gnbsim ###
 # 	gnbsim-docker-install
 # 	gnbsim-docker-uninstall
 
@@ -105,13 +109,20 @@ aether-remove-upfs: 5gc-upf-uninstall
 # 	gnbsim-docker-start
 # 	gnbsim-docker-stop
 
-### Simulation ###
 # 	gnbsim-simulator-start
 
+### Provision and run ueransim     ###
+# 	ueransim-install
+# 	ueransim-run
+# 	ueransim-uninstall
+
+
 #include at the end so rules are not overwritten
 include $(K8S_ROOT_DIR)/Makefile
 include $(GNBSIM_ROOT_DIR)/Makefile
 include $(5GC_ROOT_DIR)/Makefile
 include $(4GC_ROOT_DIR)/Makefile
 include $(AMP_ROOT_DIR)/Makefile
 include $(SDRAN_ROOT_DIR)/Makefile
+include $(UERANSIM_ROOT_DIR)/Makefile
+

deps/sdran

@@ -29,3 +29,13 @@ blueprints include:
    `standalone` being set to false so the Core runs under AMP's control.
    Details documented
    [here](https://docs.aetherproject.org/master/onramp/blueprints.html#multiple-upfs).
+
+* `main-sdran.yml`: Configures the Core and SD-RAN in tandem, with
+  RANSIM (running in the same Kubernetes namespace as SD-RAN)
+  emulating various RAN elements. Details documented
+  [here](https://docs.aetherproject.org/master/onramp/blueprints.html#sd-ran).
+
+* `main-ueransim.yml`: Configures UERANSIM in place of gNBsim,
+  providing a second way to direct workload at the Core. Details documented
+  [here](https://docs.aetherproject.org/master/onramp/blueprints.html#ueransim).
+

deps/ueransim

@@ -0,0 +1,83 @@
+k8s:
+  rke2:
+    version: v1.23.4+rke2r1
+    config:
+      token: purdue-k8s-rke2
+      port: 9345
+ 
+  kubectl:
+    version: v1.23.15
+
+  helm:
+    version: v3.10.3      
+
+core:
+  standalone: "true"
+  data_iface: ens18
+  values_file: "deps/5gc/roles/core/templates/sdcore-5g-values.yaml"
+  ran_subnet: "172.20.0.0/16"
+  helm:
+    chart_ref: aether/sd-core
+    chart_version: 0.12.6
+  upf:
+    ip_prefix: "192.168.252.0/24"
+    iface: "access"
+  amf:
+    ip: "10.76.28.113"
+
+ueransim:
+  docker:
+    container:
+      image: kunal14kapoor/ueransim:latest      
+      prefix: ueransim
+      count: 1
+    network:
+      macvlan:
+        name: ueransimnet
+
+  router:
+    data_iface: ens18
+    macvlan:
+      iface: ueransimaccess
+      subnet_prefix: "172.20"
+
+  servers:
+    0:
+      - "deps/ueransim/config/ueransim-default.yml"
+#      - "deps/ueransim/config/ueransim-default.yml"
+#    1:
+#      - "deps/ueransim/config/ueransim-default.yml"
+#      - "deps/ueransim/config/ueransim-default.yml"
+
+amp:
+  roc_models: "deps/amp/roles/roc-load/templates/roc-5g-models.json"
+  monitor_dashboard: "deps/amp/roles/monitor-load/templates/5g-monitoring"
+
+  aether_roc:
+    helm:
+      chart_ref: aether/aether-roc-umbrella
+      chart_version: 2.1.36
+
+  atomix:
+    helm:
+      chart_ref: atomix/atomix
+      chart_version: 1.1.2
+
+  onosproject:
+    helm:
+      chart_ref: onosproject/onos-operator
+      chart_version: 0.5.6
+
+  store:
+    lpp:
+      version: v0.0.24
+
+  monitor:
+    helm:
+      chart_ref: rancher/rancher-monitoring
+      chart_version: 101.0.0+up19.0.3
+
+  monitor-crd:
+    helm:
+      chart_ref: rancher/rancher-monitoring-crd
+      chart_version: 101.0.0+up19.0.3