update to 2.x models
Change-Id: I341d160d53c0870c271d37c9207abd577876505c
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index 5154918..e333576 100644
--- a/aether-roc-umbrella/Chart.yaml
+++ b/aether-roc-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
description: Aether ROC Umbrella chart to deploy all Aether ROC
kubeVersion: ">=1.18.0"
type: application
-version: 2.0.2
+version: 2.0.3
appVersion: v0.0.0
keywords:
- aether
@@ -21,6 +21,10 @@
condition: import.onos-topo.enabled
repository: https://charts.onosproject.org
version: 1.1.109
+ - name: config-model-aether-2
+ condition: onos-config.models.aether.v2.enabled
+ repository: "file://../config-models/aether-2.0.x"
+ version: 2.0.0
- name: config-model-aether-4
condition: onos-config.models.aether.v4.enabled
repository: "file://../config-models/aether-4.x"
@@ -45,7 +49,7 @@
- name: aether-roc-api
condition: import.aether-roc-api.enabled
repository: "file://../aether-roc-api"
- version: 1.3.0
+ version: 1.4.0
- name: aether-roc-websocket
condition: import.aether-roc-websocket.enabled
repository: "file://../aether-roc-websocket"
@@ -54,6 +58,10 @@
condition: import.aether-roc-gui.v4.enabled
repository: "file://../aether-roc-gui-v4"
version: 4.0.14
+ - name: sdcore-adapter-v2
+ condition: import.sdcore-adapter.v2.enabled
+ repository: "file://../sdcore-adapter-v2"
+ version: 2.0.0
- name: sdcore-adapter-v4
condition: import.sdcore-adapter.v4.enabled
repository: "file://../sdcore-adapter-v4"
diff --git a/aether-roc-umbrella/templates/topo.yaml b/aether-roc-umbrella/templates/topo.yaml
index 349eaba..ca8e808 100644
--- a/aether-roc-umbrella/templates/topo.yaml
+++ b/aether-roc-umbrella/templates/topo.yaml
@@ -11,19 +11,19 @@
aspects: {}
---
-# The 4G/5G v4.0.0 sdcore-adapter
+# The 4G/5G v2.0.0 sdcore-adapter
apiVersion: topo.onosproject.org/v1beta1
kind: Entity
metadata:
- name: connectivity-service-v4
+ name: connectivity-service-v2
spec:
- uri: connectivity-service-v4
+ uri: connectivity-service-v2
kind:
name: aether
aspects:
onos.topo.Configurable:
- address: sdcore-adapter-v4:5150
- version: 4.0.0
+ address: sdcore-adapter-v2:5150
+ version: 2.0.0
type: Aether
onos.topo.Location:
lat: 52.5150
diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml
index 8f70b28..6c40558 100644
--- a/aether-roc-umbrella/values.yaml
+++ b/aether-roc-umbrella/values.yaml
@@ -49,10 +49,10 @@
v4:
enabled: true
sdcore-adapter:
- v3:
- enabled: false
- v4:
+ v2:
enabled: true
+ v4:
+ enabled: false
subscriber-proxy:
enabled: true
sdcore-test-dummy:
@@ -126,10 +126,9 @@
port: 80
# SD-Core Adapter
-sdcore-adapter:
- nameOverride: sdcore-adapter-v3
- fullnameOverride: sdcore-adapter-v3
+sdcore-adapter-v2:
prometheusEnabled: false
+ partialUpdateEnabled: false
sdcore-adapter-v4:
prometheusEnabled: false
@@ -349,7 +348,7 @@
enabled: false
models:
aether:
- v3:
+ v2:
enabled: true
v4:
enabled: true