summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoît Ganne <bganne@cisco.com>2019-09-03 18:17:38 +0200
committerNeale Ranns <nranns@cisco.com>2019-09-23 09:13:20 +0000
commitd51880c5de3a1b22d9ac510305bdfe98fa12e51c (patch)
treec37a93982acc2c3853c57a723bfeb7f5d6b12fb8
parent6d5f6592559bc0db4294c53236177d4e35e603c6 (diff)
gbp: remove loopback interfaces between tests
Type: fix Change-Id: I440f25b95b23b717518d101a1327ecf16d6ba39a Signed-off-by: Benoît Ganne <bganne@cisco.com>
Diffstat
-rw-r--r--src/plugins/gbp/test/test_gbp.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/gbp/test/test_gbp.py b/src/plugins/gbp/test/test_gbp.py
index cb426492891..3989e233c93 100644
--- a/src/plugins/gbp/test/test_gbp.py
+++ b/src/plugins/gbp/test/test_gbp.py
@@ -652,6 +652,9 @@ class TestGBP(VppTestCase):
for i in self.pg_interfaces:
i.admin_down()
super(TestGBP, self).tearDown()
+ for i in self.lo_interfaces:
+ i.remove_vpp_config()
+ self.lo_interfaces = []
self.vlan_102.remove_vpp_config()
self.vlan_101.remove_vpp_config()
self.vlan_100.remove_vpp_config()
='get' action='/csit/log/resources/templates/kubernetes/configmaps/ch-eth-1drcl2xcbase-eth-8memif-4drcl2xc.yaml'>
path: root/resources/templates/kubernetes/configmaps/ch-eth-1drcl2xcbase-eth-8memif-4drcl2xc.yaml
blob: a9f07775e5f776e1d7334ce8914dbe1a36fce345 (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108

---
apiVersion: v1
kind: ConfigMap
metadata:
  name: sfc-controller-cfg
  namespace: csit
data:
  etcd.conf: |
    insecure-transport: true
    dial-timeout: 1000000000
    endpoints:
      - "172.17.0.1:22379"

  sfc.conf: |
    sfc_controller_config_version: 1
    description: $$TEST_NAME$$
    host_entities:
      - name: vswitch
    sfc_entities:
      - name: vswitch-vnf1
        description: vswitch to VNF1 - memif
        type: 4
        elements:
          - container: vswitch
            port_label: $$VSWITCH_IF1$$
            etcd_vpp_switch_key: vswitch
            type: 5
          - container: vnf1
            port_label: port1
            etcd_vpp_switch_key: vswitch
            type: 2
      - name: vswitch-vnf4
        description: VNF4 to vswitch - memif
        type: 4
        elements:
          - container: vswitch
            port_label: $$VSWITCH_IF2$$
            etcd_vpp_switch_key: vswitch
            type: 5
          - container: vnf4
            port_label: port2
            etcd_vpp_switch_key: vswitch
            type: 2
      - name: vnf1-vnf2
        description: vnf1 to vnf2 via vswitch - memifs
        type: 5
        elements:
          - container: vnf1
            port_label: port2
            etcd_vpp_switch_key: vswitch
            type: 2
          - container: vnf2
            port_label: port1
            etcd_vpp_switch_key: vswitch
            type: 2
      - name: vnf2-vnf3
        description: vnf2 to vnf3 via vswitch memifs
        type: 5
        elements:
          - container: vnf2
            port_label: port2
            etcd_vpp_switch_key: vswitch
            type: 2
          - container: vnf3
            port_label: port1
            etcd_vpp_switch_key: vswitch
            type: 2
      - name: vnf3-vnf4
        description: vnf3 to vnf4 via vswitch memifs
        type: 5
        elements:
          - container: vnf3
            port_label: port2
            etcd_vpp_switch_key: vswitch
            type: 2
          - container: vnf4
            port_label: port1
            etcd_vpp_switch_key: vswitch
            type: 2

  vnf.conf: |
    vnf_plugin_config_version: 1
    description: VNF config
    vnf_entities:
      - name: vnf1
        container: vnf1
        l2xconnects:
          - port_labels:
            - port1
            - port2
      - name: vnf2
        container: vnf2
        l2xconnects:
          - port_labels:
            - port1
            - port2
      - name: vnf3
        container: vnf3
        l2xconnects:
          - port_labels:
            - port1
            - port2
      - name: vnf4
        container: vnf4
        l2xconnects:
          - port_labels:
            - port1
            - port2