commit 794566fe589de51926222715aad670d307accd8c
author Andy Bavier <andy@opennetworking.org> Fri Feb 04 16:10:18 2022 -0700
committer Andy Bavier <andy@opennetworking.org> Fri Feb 04 16:10:18 2022 -0700
tree 7bb8c4e333eafb127ff86cb07c280ddae5cede62
parent 2c427733a5b425b6eb759fe5f655dce10dd2509d

AETHER-3077 Add support for 2.0 ROC models, refactoring

Change-Id: I39807ca14c757cfcf8bef0a5d48d8451d8727f89

configs/latest

diff --git a/configs/latest b/configs/latest
index 805b58c..aa06112 100644
--- a/configs/latest
+++ b/configs/latest
@@ -9,7 +9,7 @@
 5G_RAN_SIM_CHART         := aether/5g-ran-sim
 
 # For installing the ROC
-AETHER_ROC_UMBRELLA_CHART := aether/aether-roc-umbrella --version 1.4.64 # last release compatible with v4 models
+AETHER_ROC_UMBRELLA_CHART := aether/aether-roc-umbrella
 ATOMIX_CONTROLLER_CHART   := atomix/atomix-controller
 ATOMIX_RAFT_STORAGE_CHART := atomix/atomix-raft-storage
 ONOS_OPERATOR_CHART       := onosproject/onos-operator --version 0.4.14 # 0.5.x uses different way of loading models

configs/release-1.5

diff --git a/configs/release-1.5 b/configs/release-1.5
index cdf945e..3fdb139 100644
--- a/configs/release-1.5
+++ b/configs/release-1.5
@@ -15,8 +15,8 @@
 ONOS_OPERATOR_CHART       := onosproject/onos-operator --version 0.4.10
 
 # Config files to use
-ROC_VALUES     := $(MAKEDIR)/roc-values-v3.yaml
-ROC_4G_MODELS  := $(MAKEDIR)/roc-4g-models-v3.json
-ROC_5G_MODELS  := $(MAKEDIR)/roc-5g-models-v3.json
-4G_CORE_VALUES := $(MAKEDIR)/4g-core-values-1.5.yaml
-5G_CORE_VALUES := $(MAKEDIR)/5g-core-values-1.5.yaml
+ROC_VALUES     := $(MAKEDIR)/aether-1.5/roc-values.yaml
+ROC_4G_MODELS  := $(MAKEDIR)/aether-1.5/roc-4g-models-v3.json
+ROC_5G_MODELS  := $(MAKEDIR)/aether-1.5/roc-5g-models-v3.json
+4G_CORE_VALUES := $(MAKEDIR)/aether-1.5/4g-core-values.yaml
+5G_CORE_VALUES := $(MAKEDIR)/aether-1.5/5g-core-values.yaml

configs/release-1.6

diff --git a/configs/release-1.6 b/configs/release-1.6
index 025669d..fac95fd 100644
--- a/configs/release-1.6
+++ b/configs/release-1.6
@@ -13,3 +13,10 @@
 ATOMIX_CONTROLLER_CHART   := atomix/atomix-controller --version 0.6.8
 ATOMIX_RAFT_STORAGE_CHART := atomix/atomix-raft-storage --version 0.1.15
 ONOS_OPERATOR_CHART       := onosproject/onos-operator --version 0.4.14
+
+# Config files to use
+ROC_VALUES     := $(MAKEDIR)/aether-1.6/roc-values.yaml
+ROC_4G_MODELS  := $(MAKEDIR)/aether-1.6/roc-4g-models-v4.json
+ROC_5G_MODELS  := $(MAKEDIR)/aether-1.6/roc-5g-models-v4.json
+4G_CORE_VALUES := $(MAKEDIR)/aether-1.6/4g-core-values.yaml
+5G_CORE_VALUES := $(MAKEDIR)/aether-1.6/5g-core-values.yaml
\ No newline at end of file