CSIT-454: HC Test: add Honeycomb section to topology file

 - modified to match xenial topology file

Change-Id: Ic160a6162e6fab7c0232a80ce08cf6d0479717c7
Signed-off-by: selias <samelias@cisco.com>

diff --git a/resources/tools/virl/topologies/double-ring-nested.trusty.yaml b/resources/tools/virl/topologies/double-ring-nested.trusty.yaml
index 94daa1d..00b297c 100644 (file)
--- a/resources/tools/virl/topologies/double-ring-nested.trusty.yaml
+++ b/resources/tools/virl/topologies/double-ring-nested.trusty.yaml
@@ -6,12 +6,6 @@ metadata:
     - resources/topology_schemas/topology.sch.yaml
   tags: [hw, 3-node]
 
     - resources/topology_schemas/topology.sch.yaml
   tags: [hw, 3-node]
 

-honeycomb: &honeycomb
-    user: admin
-    passwd: admin
-    port: 8183
-    netconf_port: 2831
-

 nodes:
   TG:
     type: TG
 nodes:
   TG:
     type: TG


@@ -47,7 +41,10 @@ nodes:
     port: 22
     username: cisco
     honeycomb:
     port: 22
     username: cisco
     honeycomb:

-      <<: *honeycomb
+      user: admin
+      passwd: admin
+      port: 8183
+      netconf_port: 2831

     priv_key: |
 {priv_key}
     interfaces:
     priv_key: |
 {priv_key}
     interfaces:


@@ -73,7 +70,10 @@ nodes:
     port: 22
     username: cisco
     honeycomb:
     port: 22
     username: cisco
     honeycomb:

-      <<: *honeycomb
+      user: admin
+      passwd: admin
+      port: 8183
+      netconf_port: 2831

     priv_key: |
 {priv_key}
     interfaces:
     priv_key: |
 {priv_key}
     interfaces: