Kaynağa Gözat

Replicated Dortmunder fastd config. For simplicity we are now only checking if fastd listens on the correct ports

Till Klocke 9 yıl önce
ebeveyn
işleme
6cfbcd2f7c

+ 19 - 3
test/application/supernode_pkg_vars.yml

@@ -1,5 +1,5 @@
 fastd_instances:
-  - name: test
+  - name: do00
     bind: any:10000 interface "eth0" default ipv4
     interface: tap00
     loglevel: info
@@ -13,9 +13,25 @@ fastd_instances:
       batctl if add $INTERFACE
     on_verify_script: |
       /etc/fastd/fastd-blacklist.sh $PEER_KEY
+  - name: do01
+    bind: any:10001 interface "eth0" default ipv4
+    interface: tap01
+    loglevel: info
+    mode: tap
+    method: salsa2012+umac
+    peer_limit: 125
+    mtu: 1280
+    status_socket: /tmp/fastd01.sock
+    on_up_script: |
+      ip link set up $INTERFACE
+      batctl if add $INTERFACE
+    on_verify_script: |
+      /etc/fastd/fastd-blacklist.sh $PEER_KEY
 
 fastd_instances_secret:
-  - name: test
+  - name: do00
+    secret: 280088c4263359417e9f2daf1771db820ab79eb4f79e3718719b2a976e8a8b5e
+  - name: do01
     secret: 280088c4263359417e9f2daf1771db820ab79eb4f79e3718719b2a976e8a8b5e
 
 bird_router_id: 10.233.8.1
@@ -63,7 +79,7 @@ supernode_interfaces:
     auto: true
     proto: inet
     type: dhcp
-    
+
   - name: meshdummy0
     auto: true
     proto: inet 

+ 4 - 21
test/integration/supernode/serverspec/test_spec.rb

@@ -23,6 +23,10 @@ describe port(10000) do
   it { should be_listening.with('udp6') }
 end
 
+describe port(10001) do
+  it { should be_listening.with('udp6') }
+end
+
 describe package('rng-tools') do
   it { should be_installed }
 end
@@ -37,27 +41,6 @@ describe user('fastd') do
   it { should have_login_shell '/bin/false' }
 end
 
-describe file('/etc/fastd/test') do
-  it { should exist }
-  it { should be_directory }
-end
-
-describe file('/etc/fastd/test/dummy') do
-  it { should exist }
-  it { should be_directory }
-end
-
-describe file('/etc/fastd/test/fastd.conf') do
-  it { should exist }
-  it { should be_file }
-end
-
-describe file('/etc/fastd/test/secret.conf') do
-  it { should exist }
-  it { should be_file }
-  its(:content) { should contain 'secret "280088c4263359417e9f2daf1771db820ab79eb4f79e3718719b2a976e8a8b5e";' }
-end
-
 describe package('batctl') do
   it {should be_installed }
 end