Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feature/nicira_resubmit
- Loading branch information
Showing
42 changed files
with
416 additions
and
585 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| @open_flow10 | ||
| Feature: Pio::Enqueue | ||
| Feature: Pio::OpenFlow10::Enqueue | ||
|
|
||
| Scenario: new(port: 1, queue_id: 2) | ||
| When I try to create an OpenFlow action with: | ||
| """ | ||
| Pio::Enqueue.new(port: 1, queue_id: 2) | ||
| Pio::OpenFlow10::Enqueue.new(port: 1, queue_id: 2) | ||
| """ | ||
| Then it should finish successfully | ||
| And the action has the following fields and values: | ||
| | field | value | | ||
| | action_type | 11 | | ||
| | length | 16 | | ||
| | port | 1 | | ||
| | queue_id | 2 | | ||
| | field | value | | ||
| | action_type | 11 | | ||
| | action_length | 16 | | ||
| | port | 1 | | ||
| | queue_id | 2 | | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| @open_flow10 | ||
| Feature: Pio::SetEtherDestinationAddress | ||
| Feature: Pio::OpenFlow10::SetEtherDestinationAddress | ||
|
|
||
| Scenario: new('11:22:33:44:55:66') | ||
| When I try to create an OpenFlow action with: | ||
| """ | ||
| Pio::SetEtherDestinationAddress.new('11:22:33:44:55:66') | ||
| Pio::OpenFlow10::SetEtherDestinationAddress.new('11:22:33:44:55:66') | ||
| """ | ||
| Then it should finish successfully | ||
| And the action has the following fields and values: | ||
| | field | value | | ||
| | action_type | 5 | | ||
| | length | 16 | | ||
| | mac_address | 11:22:33:44:55:66 | | ||
| | field | value | | ||
| | action_type | 5 | | ||
| | action_length | 16 | | ||
| | mac_address | 11:22:33:44:55:66 | | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| @open_flow10 | ||
| Feature: Pio::SetEtherSourceAddress | ||
| Feature: Pio::OpenFlow10::SetEtherSourceAddress | ||
|
|
||
| Scenario: new('11:22:33:44:55:66') | ||
| When I try to create an OpenFlow action with: | ||
| """ | ||
| Pio::SetEtherSourceAddress.new('11:22:33:44:55:66') | ||
| Pio::OpenFlow10::SetEtherSourceAddress.new('11:22:33:44:55:66') | ||
| """ | ||
| Then it should finish successfully | ||
| And the action has the following fields and values: | ||
| | field | value | | ||
| | action_type | 4 | | ||
| | length | 16 | | ||
| | mac_address | 11:22:33:44:55:66 | | ||
| | field | value | | ||
| | action_type | 4 | | ||
| | action_length | 16 | | ||
| | mac_address | 11:22:33:44:55:66 | | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| @open_flow10 | ||
| Feature: Pio::SetIpDestinationAddress | ||
| Feature: Pio::OpenFlow10::SetIpDestinationAddress | ||
|
|
||
| Scenario: new('192.168.0.1') | ||
| When I try to create an OpenFlow action with: | ||
| """ | ||
| Pio::SetIpDestinationAddress.new('192.168.0.1') | ||
| Pio::OpenFlow10::SetIpDestinationAddress.new('192.168.0.1') | ||
| """ | ||
| Then it should finish successfully | ||
| And the action has the following fields and values: | ||
| | field | value | | ||
| | action_type | 7 | | ||
| | length | 8 | | ||
| | ip_address | 192.168.0.1 | | ||
| | field | value | | ||
| | action_type | 7 | | ||
| | action_length | 8 | | ||
| | ip_address | 192.168.0.1 | | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| @open_flow10 | ||
| Feature: Pio::SetIpSourceAddress | ||
| Feature: Pio::OpenFlow10::SetIpSourceAddress | ||
|
|
||
| Scenario: new('192.168.0.1') | ||
| When I try to create an OpenFlow action with: | ||
| """ | ||
| Pio::SetIpSourceAddress.new('192.168.0.1') | ||
| Pio::OpenFlow10::SetIpSourceAddress.new('192.168.0.1') | ||
| """ | ||
| Then it should finish successfully | ||
| And the action has the following fields and values: | ||
| | field | value | | ||
| | action_type | 6 | | ||
| | length | 8 | | ||
| | ip_address | 192.168.0.1 | | ||
| | field | value | | ||
| | action_type | 6 | | ||
| | action_length | 8 | | ||
| | ip_address | 192.168.0.1 | | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| @open_flow10 | ||
| Feature: Pio::SetIpTos | ||
| Feature: Pio::OpenFlow10::SetIpTos | ||
|
|
||
| Scenario: new(0b11111100) | ||
| When I try to create an OpenFlow action with: | ||
| """ | ||
| Pio::SetIpTos.new(0b11111100) | ||
| Pio::OpenFlow10::SetIpTos.new(0b11111100) | ||
| """ | ||
| Then it should finish successfully | ||
| And the action has the following fields and values: | ||
| | field | value | | ||
| | action_type | 8 | | ||
| | length | 8 | | ||
| | action_length | 8 | | ||
| | type_of_service | 252 | | ||
|
|
||
|
|
12 changes: 6 additions & 6 deletions
12
features/open_flow10/set_transport_destination_port.feature
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| @open_flow10 | ||
| Feature: Pio::SetTransportDestinationPort | ||
| Feature: Pio::OpenFlow10::SetTransportDestinationPort | ||
|
|
||
| Scenario: new(100) | ||
| When I try to create an OpenFlow action with: | ||
| """ | ||
| Pio::SetTransportDestinationPort.new(100) | ||
| Pio::OpenFlow10::SetTransportDestinationPort.new(100) | ||
| """ | ||
| Then it should finish successfully | ||
| And the action has the following fields and values: | ||
| | field | value | | ||
| | action_type | 10 | | ||
| | length | 8 | | ||
| | port | 100 | | ||
| | field | value | | ||
| | action_type | 10 | | ||
| | action_length | 8 | | ||
| | port | 100 | | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| @open_flow10 | ||
| Feature: Pio::SetTransportSourcePort | ||
| Feature: Pio::OpenFlow10::SetTransportSourcePort | ||
|
|
||
| Scenario: new(100) | ||
| When I try to create an OpenFlow action with: | ||
| """ | ||
| Pio::SetTransportSourcePort.new(100) | ||
| Pio::OpenFlow10::SetTransportSourcePort.new(100) | ||
| """ | ||
| Then it should finish successfully | ||
| And the action has the following fields and values: | ||
| | field | value | | ||
| | action_type | 9 | | ||
| | length | 8 | | ||
| | port | 100 | | ||
| | field | value | | ||
| | action_type | 9 | | ||
| | action_length | 8 | | ||
| | port | 100 | | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| @open_flow10 | ||
| Feature: Pio::SetVlanPriority | ||
| Feature: Pio::OpenFlow10::SetVlanPriority | ||
|
|
||
| Scenario: new(1) | ||
| When I try to create an OpenFlow action with: | ||
| """ | ||
| Pio::SetVlanPriority.new(1) | ||
| Pio::OpenFlow10::SetVlanPriority.new(1) | ||
| """ | ||
| Then it should finish successfully | ||
| And the action has the following fields and values: | ||
| | field | value | | ||
| | action_type | 2 | | ||
| | length | 8 | | ||
| | action_length | 8 | | ||
| | vlan_priority | 1 | | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| @open_flow10 | ||
| Feature: Pio::SetVlanVid | ||
| Feature: Pio::OpenFlow10::SetVlanVid | ||
|
|
||
| Scenario: new(1) | ||
| When I try to create an OpenFlow action with: | ||
| """ | ||
| Pio::SetVlanVid.new(1) | ||
| Pio::OpenFlow10::SetVlanVid.new(1) | ||
| """ | ||
| Then it should finish successfully | ||
| And the action has the following fields and values: | ||
| | field | value | | ||
| | action_type | 1 | | ||
| | length | 8 | | ||
| | vlan_id | 1 | | ||
| | field | value | | ||
| | action_type | 1 | | ||
| | action_length | 8 | | ||
| | vlan_id | 1 | | ||
|
|
||
|
|
Oops, something went wrong.