enable aether-4.0 models
Change-Id: I7376f7580ecd74264a8526291e9bb53e11328012
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index e556777..e61c224 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: 1.4.0
+version: 1.4.1
appVersion: v0.0.0
keywords:
- aether
@@ -31,6 +31,11 @@
repository: "@aether"
version: 3.0.13
alias: config-model-aether-3-0-0
+ - name: config-model-aether
+ condition: onos-config.models.aether.v4.enabled
+ repository: "@aether"
+ version: 4.0.4
+ alias: config-model-aether-4-0-0
- name: onos-config
condition: import.onos-config.enabled
repository: https://charts.onosproject.org
diff --git a/aether-roc-umbrella/templates/topo.yaml b/aether-roc-umbrella/templates/topo.yaml
index a32d520..45cd770 100644
--- a/aether-roc-umbrella/templates/topo.yaml
+++ b/aether-roc-umbrella/templates/topo.yaml
@@ -53,3 +53,26 @@
onos.topo.Asset:
name: 5G Core
onos.topo.MastershipState: {}
+---
+# The 4G/5G v4.0.0 sdcore-adapter
+apiVersion: topo.onosproject.org/v1beta1
+kind: Entity
+metadata:
+ name: connectivity-service-v4
+spec:
+ uri: connectivity-service-v4
+ kind:
+ name: aether
+ aspects:
+ onos.topo.Configurable:
+ address: sdcore-adapter-v4:5150
+ version: 4.0.0
+ type: Aether
+ onos.topo.Location:
+ lat: 52.5150
+ lng: 13.3885
+ onos.topo.TLSOptions:
+ insecure: true
+ onos.topo.Asset:
+ name: 5G Core
+ onos.topo.MastershipState: {}
diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml
index bcd17fc..9752a81 100644
--- a/aether-roc-umbrella/values.yaml
+++ b/aether-roc-umbrella/values.yaml
@@ -46,6 +46,8 @@
enabled: false
v3:
enabled: true
+ v4:
+ enabled: true
sdcore-adapter:
v2_1:
enabled: true