Fix the bug with vlan_id always equal 1 in Table 10 (VLAN) for the test case 'flows.PacketInIPTable' and the Copyright header in .abat-automerge
Change-Id: Ie131435cbb7bd18b7481c4a769eb70081e935438
diff --git a/.abat-automerge b/.abat-automerge
index ad5e15d..b7e5788 100755
--- a/.abat-automerge
+++ b/.abat-automerge
@@ -1,3 +1,18 @@
+
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
#!/bin/bash -eux
cd $(dirname $(readlink -f $0))
./pylint.sh
diff --git a/ofdpa/flows.py b/ofdpa/flows.py
index a2f725d..1b6d2d4 100755
--- a/ofdpa/flows.py
+++ b/ofdpa/flows.py
@@ -186,7 +186,7 @@
l3_msg = add_l3_unicast_group( self.controller, port, vlanid=vlan_id, id=vlan_id,
src_mac=intf_src_mac, dst_mac=dst_mac )
# add vlan flow table
- add_one_vlan_table_flow( self.controller, port, vlan_id, flag=VLAN_TABLE_FLAG_ONLY_TAG )
+ add_one_vlan_table_flow( self.controller, port, vlan_id=vlan_id, flag=VLAN_TABLE_FLAG_ONLY_TAG )
# add termination flow
add_termination_flow( self.controller, port, 0x0800, intf_src_mac, vlan_id )
# add unicast routing flow