summaryrefslogtreecommitdiffstats
path: root/acl/acl-impl
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2018-02-19 15:03:19 +0100
committerMarek Gradzki <mgradzki@cisco.com>2018-04-04 04:16:14 +0000
commit5365646dc85aad32b7be4918122ce6d8e6de2fe3 (patch)
treea646d1b2c693fe0481e19fe39ecdb4486a7fffb6 /acl/acl-impl
parent4af77ce878baf1ac89ed9111274bc7375c878949 (diff)
Adapt hc2vpp to ODL Oxygen (HONEYCOMB-424)
Requires https://gerrit.fd.io/r/#/c/11320/ Also changes encoding of empty type in json test files to [null] (RFC8040) from {} that was used so far. Honeycomb uses draft-ietf-netconf-restconf-02 of restconf compoments, so there might be a bug in ODL or HC configuration. To resolve it, using RFC8040 version of ODL restconf components should be considered (HONEYCOMB-430). Not covered: - postman collections update - CSIT tests update Change-Id: I820c46b5b0b22330e8529e8870c8bdad9508473b Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'acl/acl-impl')
-rw-r--r--acl/acl-impl/src/test/resources/acl/macip/macip-acl.json2
-rw-r--r--acl/acl-impl/src/test/resources/acl/standard/standard-acl-icmp-v6.json2
-rw-r--r--acl/acl-impl/src/test/resources/acl/standard/standard-acl-icmp.json2
-rw-r--r--acl/acl-impl/src/test/resources/acl/standard/standard-acl-tcp-src-only.json2
-rw-r--r--acl/acl-impl/src/test/resources/acl/standard/standard-acl-tcp.json2
-rw-r--r--acl/acl-impl/src/test/resources/acl/standard/standard-acl-udp.json2
6 files changed, 6 insertions, 6 deletions
diff --git a/acl/acl-impl/src/test/resources/acl/macip/macip-acl.json b/acl/acl-impl/src/test/resources/acl/macip/macip-acl.json
index 40858f122..21ac2597c 100644
--- a/acl/acl-impl/src/test/resources/acl/macip/macip-acl.json
+++ b/acl/acl-impl/src/test/resources/acl/macip/macip-acl.json
@@ -17,7 +17,7 @@
}
},
"actions": {
- "permit": {}
+ "permit": [null]
}
}
]
diff --git a/acl/acl-impl/src/test/resources/acl/standard/standard-acl-icmp-v6.json b/acl/acl-impl/src/test/resources/acl/standard/standard-acl-icmp-v6.json
index 106432758..9c6530fa9 100644
--- a/acl/acl-impl/src/test/resources/acl/standard/standard-acl-icmp-v6.json
+++ b/acl/acl-impl/src/test/resources/acl/standard/standard-acl-icmp-v6.json
@@ -26,7 +26,7 @@
}
},
"actions": {
- "permit": {}
+ "permit": [null]
}
}
]
diff --git a/acl/acl-impl/src/test/resources/acl/standard/standard-acl-icmp.json b/acl/acl-impl/src/test/resources/acl/standard/standard-acl-icmp.json
index d278e1529..73a9a6543 100644
--- a/acl/acl-impl/src/test/resources/acl/standard/standard-acl-icmp.json
+++ b/acl/acl-impl/src/test/resources/acl/standard/standard-acl-icmp.json
@@ -26,7 +26,7 @@
}
},
"actions": {
- "permit": {}
+ "permit": [null]
}
}
]
diff --git a/acl/acl-impl/src/test/resources/acl/standard/standard-acl-tcp-src-only.json b/acl/acl-impl/src/test/resources/acl/standard/standard-acl-tcp-src-only.json
index 48e6f8807..13e757907 100644
--- a/acl/acl-impl/src/test/resources/acl/standard/standard-acl-tcp-src-only.json
+++ b/acl/acl-impl/src/test/resources/acl/standard/standard-acl-tcp-src-only.json
@@ -26,7 +26,7 @@
}
},
"actions": {
- "permit": {}
+ "permit": [null]
}
}
]
diff --git a/acl/acl-impl/src/test/resources/acl/standard/standard-acl-tcp.json b/acl/acl-impl/src/test/resources/acl/standard/standard-acl-tcp.json
index 42d14ce0b..6b5dbafc7 100644
--- a/acl/acl-impl/src/test/resources/acl/standard/standard-acl-tcp.json
+++ b/acl/acl-impl/src/test/resources/acl/standard/standard-acl-tcp.json
@@ -28,7 +28,7 @@
}
},
"actions": {
- "permit": {}
+ "permit": [null]
}
}
]
diff --git a/acl/acl-impl/src/test/resources/acl/standard/standard-acl-udp.json b/acl/acl-impl/src/test/resources/acl/standard/standard-acl-udp.json
index 5e945be40..e49a93cfa 100644
--- a/acl/acl-impl/src/test/resources/acl/standard/standard-acl-udp.json
+++ b/acl/acl-impl/src/test/resources/acl/standard/standard-acl-udp.json
@@ -26,7 +26,7 @@
}
},
"actions": {
- "permit": {}
+ "permit": [null]
}
}
]