commit 01ba717bf58aff877f4b59685a3779f965c8b6b7
author Marek Celoud <mceloud@mirantis.com> Mon Aug 07 12:31:53 2017 +0200
committer Marek Celoud <mceloud@mirantis.com> Thu Aug 17 16:14:10 2017 +0200
tree d9b2f3a695e6eb21c40319aa1771b4de149adcda
parent 71b310a93f2f84196957ab0a6f8badb0218e988d

refactor TSN

Change-Id: I353ba2b6c64398ab48d8801ebd25b63442471092

tests/pillar/tor.sls

diff --git a/tests/pillar/tor.sls b/tests/pillar/tor.sls
deleted file mode 100644
index 04ecba0..0000000
--- a/tests/pillar/tor.sls
+++ /dev/null
@@ -1,35 +0,0 @@
-opencontrail:
-  common:
-    version: 3.0
-    identity:
-      engine: keystone
-      host: 127.0.0.1
-      port: 35357
-      token: token
-      password: password
-    network:
-      engine: neutron
-      host: 127.0.0.1
-      port: 9696
-  tor:
-    enabled: true
-    version: 3.0
-    agents: 1
-    control:
-      address: 127.0.0.1
-    interface:
-      address: 127.0.0.1
-    device:
-      host: 127.0.0.1
-  compute:
-    enabled: true
-    version: 3.0
-    discovery:
-      host: 127.0.0.1
-    interface:
-      address: 127.0.0.1
-      dev: eth0
-      gateway: 127.0.0.1
-      mask: /24
-      dns: 127.0.0.1
-      mtu: 9000

tests/pillar/tor4_0.sls

diff --git a/tests/pillar/tor4_0.sls b/tests/pillar/tor4_0.sls
deleted file mode 100644
index 16b59fc..0000000
--- a/tests/pillar/tor4_0.sls
+++ /dev/null
@@ -1,43 +0,0 @@
-opencontrail:
-  common:
-    version: 4.0
-    identity:
-      engine: keystone
-      host: 127.0.0.1
-      port: 35357
-      token: token
-      password: password
-    network:
-      engine: neutron
-      host: 127.0.0.1
-      port: 9696
-  tor:
-    enabled: true
-    version: 4.0
-    agents: 1
-    control:
-      address: 127.0.0.1
-    interface:
-      address: 127.0.0.1
-    device:
-      host: 127.0.0.1
-  compute:
-    enabled: true
-    version: 4.0
-    collector:
-      members:
-      - host: 127.0.0.1
-      - host: 127.0.0.1
-      - host: 127.0.0.1
-    control:
-      members:
-      - host: 127.0.0.1
-      - host: 127.0.0.1
-      - host: 127.0.0.1
-    interface:
-      address: 127.0.0.1
-      dev: eth0
-      gateway: 127.0.0.1
-      mask: /24
-      dns: 127.0.0.1
-      mtu: 9000

tests/pillar/vrouter.sls

diff --git a/tests/pillar/vrouter.sls b/tests/pillar/vrouter.sls
index 45418a0..13e05e5 100644
--- a/tests/pillar/vrouter.sls
+++ b/tests/pillar/vrouter.sls
@@ -25,3 +25,14 @@
       mask: /24
       dns: 127.0.0.1
       mtu: 9000
+    tor:
+      enabled: true
+      bind:
+        port: 8086
+      agent:
+        tor01:
+          id: 0
+          address: 127.0.0.1
+          port: 6632
+          ssl:
+            enabled: True
\ No newline at end of file

tests/pillar/vrouter4_0.sls

diff --git a/tests/pillar/vrouter4_0.sls b/tests/pillar/vrouter4_0.sls
index c875642..f19ce4e 100644
--- a/tests/pillar/vrouter4_0.sls
+++ b/tests/pillar/vrouter4_0.sls
@@ -33,3 +33,14 @@
       mask: /24
       dns: 127.0.0.1
       mtu: 9000
+    tor:
+      enabled: true
+      bind:
+        port: 8086
+      agent:
+        tor01:
+          id: 0
+          address: 127.0.0.1
+          port: 6632
+          ssl:
+            enabled: True