ofp-util: Use 32bit port for Open Flow 1.1 & 1.2 Port Mod Request

When encoding Open Flow 1.1 & 1.2 Port Mod Request messages
the port number should be converted to 32bits using
ofputil_port_to_ofp11() rather than htonl(). This ensures
that port numbers in the reserved range are translated correctly.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>
(cherry picked from commit 026a517999746f5578d8a3031e3df411b37096d2)

Conflicts:
	lib/ofp-util.c

Signed-off-by: Simon Horman <horms@verge.net.au>
ofp-print: Correct tests to use OFPT10_FLOW_MOD

Correct tests to use OFPT10_FLOW_MOD instead of OFPT_FLOW_MOD.
This is unique to the osrg tree.

Signed-off-by: Simon Horman <horms@verge.net.au>
ofp-print: Correct tests to use OFPT11_FLOW (OF1.2)

Correct tests to use OFPT11_FLOW (OF1.2) instead of NXST_FLOW.
This is unique to the osrg tree.

Signed-off-by: Simon Horman <horms@verge.net.au>
ofp-print: Correct tests to use OFPT10_AGGREGATE

Correct tests to use OFPT10_AGGREGATE instead of OFPT_AGGREGATE.
This is unique to the osrg tree.

Signed-off-by: Simon Horman <horms@verge.net.au>
ofp-print: Correct tests to use OFPST10_FLOW

Correct tests to use OFPST10_FLOW instead of OFPST_FLOW.
This is unique to the osrg tree.

Signed-off-by: Simon Horman <horms@verge.net.au>
ofp-print: Update test for more compact NXM_FLOW_MOD format

The osrg tree uses a more compact format to output NXM_FLOW_MOD.
Update the test-suite accordingly.

Signed-off-by: Simon Horman <horms@verge.net.au>
ofp-error: Update tests to use "(OF1.2)"

Earlier versions of the code used "(OF 0x03)" but the relevant
code has been updated for OpenFlow 1.2 and now outputs "(OF1.2)".

Signed-off-by: Simon Horman <horms@verge.net.au>
ofproto-dpif: Remove DSCP test

In the osrg tree this test is run using OpenFlow1.2 however
support is not present in the tree for setting DSCP using
OpenFlow1.2.

Signed-off-by: Simon Horman <horms@verge.net.au>
ofproto-dpif: Remove noflood test

In the osrg tree this test is run using OpenFlow1.2 however
noflood is not present in OpenFlow1.1+.

Signed-off-by: Simon Horman <horms@verge.net.au>
ofproto-dpif: Remove enqueue test

In the osrg tree this test is run using OpenFlow1.2 however
enqueue is support is not not present for OpenFlow1.1+ in
the osrg tree.

Signed-off-by: Simon Horman <horms@verge.net.au>
ofproto-dpif: Update invalid ttl test for OpenFlow 1.2.

In the osrg tree this test is run using OpenFlow1.2
so update the expected result accordingly.

Signed-off-by: Simon Horman <horms@verge.net.au>
ofproto-dpif: Remove fragment handling test

In the osrg tree this test is run using OpenFlow1.2 however
fragment handling using OpenFlow1.2 is not supported.

This is specific to the osrg tree.

Signed-off-by: Simon Horman <horms@verge.net.au>
ofproto-dpif: Use set_field to set MPLS label and tc

Use set_field action to set the MPLS label and tc
as the set_mpls_label and set_mpls_tc actions are not
part of the OpenFlow 1.2 specification and not implemented
in the osrg tree. They are also not present in mainline.

Signed-off-by: Simon Horman <horms@verge.net.au>
ofproto-dpif: Use set_field to set VLAN VID and PCP

Use set_field action to set the VLAN VID and PCP
as the set_vlan_vid and set_vlan_pcp actions are not
part of the OpenFlow 1.2 specification and in the osrg
tree these tests are run using OpenFlow 1.2.

Signed-off-by: Simon Horman <horms@verge.net.au>
ofproto-dpif: Use set_field to set ethernet source and destination

Use set_field action to set the ethernet source addresses
as the set_dl_src and set_dl_dst actions are not
part of the OpenFlow 1.2 specification and in the osrg
tree these tests are run using OpenFlow 1.2.

Signed-off-by: Simon Horman <horms@verge.net.au>
ofproto-dpif: Use set_field to set IPv4 source and destination

Use set_field action to set the IPv4 source addresses
as the set_nw_src and set_nw_dst actions are not
part of the OpenFlow 1.2 specification and in the osrg
tree these tests are run using OpenFlow 1.2.

Signed-off-by: Simon Horman <horms@verge.net.au>
ofproto-dpif: Use set_field to set TCP source and destination

Use set_field action to set the TCP source ports
as the set_tp_src and set_tp_dst actions are not
part of the OpenFlow 1.2 specification and in the osrg
tree these tests are run using OpenFlow 1.2.

Signed-off-by: Simon Horman <horms@verge.net.au>
ofproto-dpif: Update tests to expect OFPT_PACKET_IN (1.2)

In the osrg tests are run using OpenFlow 1.2 so
update the results of tests to expect OFPT_PACKET_IN (1.2).

Signed-off-by: Simon Horman <horms@verge.net.au>
ofproto: Update test to use OFPST_PORT (OF1.2)

In the osrg tree this tests is run using OpenFlow 1.2
so update the expected result to use OFPST_PORT (OF1.2).

This is specific to the osrg tree.

Signed-off-by: Simon Horman <horms@verge.net.au>
ofproto: Update test to use OFPST_PORT_DESC (OF1.2)

In the osrg tree this tests is run using OpenFlow 1.2
so update the expected result to use OFPST_PORT_DESC (OF1.2).

This is specific to the osrg tree.

Signed-off-by: Simon Horman <horms@verge.net.au>