roc-umbrella: topo entities as enterprise

Change-Id: Ia55788db06b000a3a439938bf1d97fbe9e29676f
diff --git a/aether-roc-umbrella/templates/NOTES.txt b/aether-roc-umbrella/templates/NOTES.txt
index 9e22a67..9496540 100644
--- a/aether-roc-umbrella/templates/NOTES.txt
+++ b/aether-roc-umbrella/templates/NOTES.txt
@@ -14,12 +14,7 @@
 
 You can attach to:
 * Aether CLI pod with
-$ kubectl -n {{.Release.Namespace}} exec -it $(kubectl -n {{.Release.Namespace}} get pods -l type=cli -o name) -- /bin/sh
-* Aether Portal at http://<server_IP>:31190
+$ kubectl -n {{.Release.Namespace}} exec -it deployment/onos-cli -- /bin/bash
+* Aether Portal at http://<server_IP>:31194
 
-If you are using KinD as a Kubernetes server, you will have to use a "port-forward" to access the Aether ROC GUI e.g.
-$ kubectl -n {{.Release.Namespace}} port-forward service/aether-roc-gui 8183:80
-and then access the GUI at
-* http://localhost:8183
-
-The aether-roc-api is then available at http://localhost:8183/aether-roc-api
+The aether-roc-api is then available at http://<server_IP>:31194/aether-roc-api
diff --git a/aether-roc-umbrella/templates/topo.yaml b/aether-roc-umbrella/templates/topo.yaml
index d648841..b9198e9 100644
--- a/aether-roc-umbrella/templates/topo.yaml
+++ b/aether-roc-umbrella/templates/topo.yaml
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-# A topology kind representing an E2 node
+# A topology kind representing an Aether node
 apiVersion: topo.onosproject.org/v1beta1
 kind: Kind
 metadata:
@@ -11,6 +11,15 @@
   aspects: {}
 
 ---
+# A topology kind representing an Aether Enterprise node
+apiVersion: topo.onosproject.org/v1beta1
+kind: Kind
+metadata:
+  name: enterprise
+spec:
+  aspects: {}
+
+---
 # The 4G/5G v2.0.0 sdcore-adapter
 apiVersion: topo.onosproject.org/v1beta1
 kind: Entity
@@ -43,7 +52,7 @@
 spec:
   uri: {{ .id }}
   kind:
-    name: aether
+    name: enterprise
   aspects:
     onos.topo.Configurable:
       address: sdcore-adapter-v2-1:5150