Aether-3397: roc-umbrella add new 2.1.0 models

Change-Id: I935fad4da414c074831ae681f3c51048f88989c0
diff --git a/aether-roc-umbrella/templates/topo.yaml b/aether-roc-umbrella/templates/topo.yaml
index 4185308..2a187c7 100644
--- a/aether-roc-umbrella/templates/topo.yaml
+++ b/aether-roc-umbrella/templates/topo.yaml
@@ -33,15 +33,14 @@
     onos.topo.Asset:
       name: 5G Core
     onos.topo.MastershipState: {}
-
 ---
 # The 4G/5G v2.1.0 sdcore-adapter
 apiVersion: topo.onosproject.org/v1beta1
 kind: Entity
 metadata:
-  name: connectivity-service-v2-1
+  name: starbucks
 spec:
-  uri: connectivity-service-v2-1
+  uri: starbucks
   kind:
     name: aether
   aspects:
@@ -55,5 +54,51 @@
     onos.topo.TLSOptions:
       insecure: true
     onos.topo.Asset:
-      name: 5G Core
+      name: Starbucks Enterprise
+    onos.topo.MastershipState: {}
+---
+# The 4G/5G v2.1.0 sdcore-adapter
+apiVersion: topo.onosproject.org/v1beta1
+kind: Entity
+metadata:
+  name: acme
+spec:
+  uri: acme
+  kind:
+    name: aether
+  aspects:
+    onos.topo.Configurable:
+      address: sdcore-adapter-v2-1:5150
+      version: 2.1.x
+      type: aether
+    onos.topo.Location:
+      lat: 52.5150
+      lng: 13.3885
+    onos.topo.TLSOptions:
+      insecure: true
+    onos.topo.Asset:
+      name: ACME Enterprise
+    onos.topo.MastershipState: {}
+---
+# The 4G/5G v2.1.0 sdcore-adapter
+apiVersion: topo.onosproject.org/v1beta1
+kind: Entity
+metadata:
+  name: defaultent
+spec:
+  uri: defaultent
+  kind:
+    name: aether
+  aspects:
+    onos.topo.Configurable:
+      address: sdcore-adapter-v2-1:5150
+      version: 2.1.x
+      type: aether
+    onos.topo.Location:
+      lat: 52.5150
+      lng: 13.3885
+    onos.topo.TLSOptions:
+      insecure: true
+    onos.topo.Asset:
+      name: Default Enterprise
     onos.topo.MastershipState: {}