AETHER-2472 Update ROC models to 4.0.0
Change-Id: I682a04ecc0972dd7c4bb9c705478982a41117dc6
diff --git a/configs/release-1.5 b/configs/release-1.5
index 2dbe4d7..4d4d9ca 100644
--- a/configs/release-1.5
+++ b/configs/release-1.5
@@ -2,19 +2,21 @@
#
# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-OMEC_CONTROL_PLANE_CHART := aether/omec-control-plane --version 0.6.25
-OMEC_USER_PLANE_CHART := aether/omec-user-plane --version 0.3.36
+OMEC_CONTROL_PLANE_CHART := aether/omec-control-plane --version 0.7.14
+OMEC_USER_PLANE_CHART := aether/omec-user-plane --version 0.4.8
-# Release version of omec-sub-provision is actually 0.0.6 but that version
-# is unable to configure network slices and device groups. That's only an
-# issue if not using the ROC. It is fixed in 0.1.1.
-OMEC_SUB_PROVISION_CHART := aether/omec-sub-provision --version 0.1.1
+OMEC_SUB_PROVISION_CHART := aether/omec-sub-provision --version 0.1.3
-5GC_CONTROL_PLANE_CHART := aether/5g-control-plane --version 0.2.21
+5GC_CONTROL_PLANE_CHART := aether/5g-control-plane --version 0.3.14
5G_RAN_SIM_CHART := aether/5g-ran-sim --version 0.0.2
# For installing the ROC
-AETHER_ROC_UMBRELLA_CHART := aether/aether-roc-umbrella --version 1.3.8
+AETHER_ROC_UMBRELLA_CHART := aether/aether-roc-umbrella --version 1.3.15
ATOMIX_CONTROLLER_CHART := atomix/atomix-controller --version 0.6.8
-ATOMIX_RAFT_STORAGE_CHART := atomix/atomix-raft-storage --version 0.1.9
+ATOMIX_RAFT_STORAGE_CHART := atomix/atomix-raft-storage --version 0.1.14
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
\ No newline at end of file
diff --git a/configs/release-1.5.1 b/configs/release-1.5.1
deleted file mode 100644
index 9638a73..0000000
--- a/configs/release-1.5.1
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2021-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-OMEC_CONTROL_PLANE_CHART := aether/omec-control-plane --version 0.7.7
-OMEC_USER_PLANE_CHART := aether/omec-user-plane --version 0.4.1
-
-OMEC_SUB_PROVISION_CHART := aether/omec-sub-provision --version 0.1.3
-
-5GC_CONTROL_PLANE_CHART := aether/5g-control-plane --version 0.3.7
-5G_RAN_SIM_CHART := aether/5g-ran-sim --version 0.0.2
-
-# For installing the ROC
-AETHER_ROC_UMBRELLA_CHART := aether/aether-roc-umbrella --version 1.3.11
-ATOMIX_CONTROLLER_CHART := atomix/atomix-controller --version 0.6.8
-ATOMIX_RAFT_STORAGE_CHART := atomix/atomix-raft-storage --version 0.1.9
-ONOS_OPERATOR_CHART := onosproject/onos-operator --version 0.4.10
diff --git a/configs/release-1.5.2 b/configs/release-1.5.2
deleted file mode 100644
index a73bd32..0000000
--- a/configs/release-1.5.2
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2021-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-OMEC_CONTROL_PLANE_CHART := aether/omec-control-plane --version 0.7.14
-OMEC_USER_PLANE_CHART := aether/omec-user-plane --version 0.4.8
-
-OMEC_SUB_PROVISION_CHART := aether/omec-sub-provision --version 0.1.3
-
-5GC_CONTROL_PLANE_CHART := aether/5g-control-plane --version 0.3.14
-5G_RAN_SIM_CHART := aether/5g-ran-sim --version 0.0.2
-
-# For installing the ROC
-AETHER_ROC_UMBRELLA_CHART := aether/aether-roc-umbrella --version 1.3.15
-ATOMIX_CONTROLLER_CHART := atomix/atomix-controller --version 0.6.8
-ATOMIX_RAFT_STORAGE_CHART := atomix/atomix-raft-storage --version 0.1.14
-ONOS_OPERATOR_CHART := onosproject/onos-operator --version 0.4.10