Merge pull request #1814 from ozdanborne/bump-libcalico-go

Bump libcalico go
projectcalico · Mar 1, 2018 · 1412e34 · 1412e34
2 parents db18ec2 + 46bed62
commit 1412e34
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 25 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -30,7 +30,7 @@ import:
   - ssh/terminal
 - package: github.com/projectcalico/go-yaml-wrapper
 - package: github.com/projectcalico/libcalico-go
-  version: 26b83dc3ccceeff9312eaf339386e6599c89c63b
+  version: 2fa2887d917b41342f9beaae745dff2355e4f47c
   subpackages:
   - lib/apis/v3
   - lib/clientv3

diff --git a/test-data/v1/policy.yaml b/test-data/v1/policy.yaml
@@ -7,9 +7,6 @@
     ingress:
       - action: allow
         protocol: udp
-        icmp:
-          type: 10
-          code: 100
         source:
           tag: web
           net: 1.2.3.4/10

diff --git a/tests/st/calicoctl/test_crud.py b/tests/st/calicoctl/test_crud.py
@@ -1864,6 +1864,7 @@ class InvalidData(TestBase):
                                         'ICMP': {'type': 256,  # max value 255
                                                  'code': 255},
                                         'action': 'Deny',
+                                        'protocol': 'ICMP',
                                         'destination': {},
                                         'source': {}}],
                        }
@@ -1882,6 +1883,7 @@ class InvalidData(TestBase):
                                         'ICMP': {'type': 19,
                                                  'code': 256},  # max value 255
                                         'action': 'Deny',
+                                        'protocol': 'ICMP',
                                         'destination': {},
                                         'source': {}}],
                        }
@@ -1912,6 +1914,7 @@ class InvalidData(TestBase):
                                         'ICMP': {'type': 256,  # 1-byte field
                                                  'code': 255},
                                         'action': 'Deny',
+                                        'protocol': 'ICMP',
                                         'destination': {},
                                         'source': {}}],
                            },

diff --git a/tests/st/utils/data.py b/tests/st/utils/data.py
@@ -132,7 +132,6 @@
         ],
         'ingress': [
             {
-                'notICMP': {'type': 19, 'code': 255},
                 'ipVersion': 4,
                 'action': 'Deny',
                 'destination': {
@@ -143,7 +142,6 @@
                     'ports': ['100:200'],
                     'selector': "type=='application'",
                 },
-                'icmp': {'type': 10, 'code': 6},
                 'protocol': 'TCP',
                 'source': {
                     'notNets': ['10.1.0.0/16'],
@@ -260,7 +258,6 @@
         ],
         'ingress': [
             {
-                'notICMP': {'type': 19, 'code': 255},
                 'ipVersion': 4,
                 'action': 'Deny',
                 'destination': {
@@ -271,7 +268,6 @@
                     'ports': ['100:200'],
                     'selector': "type=='application'",
                 },
-                'icmp': {'type': 10, 'code': 6},
                 'protocol': 'TCP',
                 'source': {
                     'notNets': ['10.1.0.0/16'],
@@ -426,7 +422,6 @@
         ],
         'ingress': [
             {
-                'notICMP': {'type': 19, 'code': 255},
                 'ipVersion': 4,
                 'action': 'Deny',
                 'destination': {
@@ -436,7 +431,6 @@
                    'nets': ['10.2.0.0/16'],
                    'ports': ['100:200'],
                    'selector': "type=='application'"},
-                'icmp': {'type': 10, 'code': 6},
                 'protocol': 'TCP',
                 'source': {
                    'notNets': ['10.1.0.0/16'],