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

Makefile

diff --git a/Makefile b/Makefile
index 84f11fa..68b682e 100644
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,11 @@
 4G_CORE_VALUES ?= $(MAKEDIR)/4g-core-values.yaml
 5G_CORE_VALUES ?= $(MAKEDIR)/5g-core-values.yaml
 OAISIM_VALUES  ?= $(MAKEDIR)/oaisim-values.yaml
-ROC_VALUES     ?= $(MAKEDIR)/roc-values-v4.yaml
+ROC_VALUES     ?= $(MAKEDIR)/roc-values.yaml
 UPF_VALUES     ?= $(MAKEDIR)/upf-values.yaml
 RANSIM_VALUES  ?= $(MAKEDIR)/ransim-values.yaml
-ROC_4G_MODELS  ?= $(MAKEDIR)/roc-4g-models-v4.json
-ROC_5G_MODELS  ?= $(MAKEDIR)/roc-5g-models-v4.json
+ROC_4G_MODELS  ?= $(MAKEDIR)/roc-4g-models.json
+ROC_5G_MODELS  ?= $(MAKEDIR)/roc-5g-models.json
 TEST_APP_VALUES?= $(MAKEDIR)/5g-test-apps-values.yaml
 
 KUBESPRAY_VERSION ?= release-2.17