1542 Commits

Author SHA1 Message Date
FUJITA Tomonori
4ad6c60104 apgw: fix queue stats uuid
queue id is not globally unique so we can't use it as a key for
monitored_queue dict.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2.5.1
2014-04-14 12:35:05 +09:00
FUJITA Tomonori
8e09dd9870 apgw: remove ofconfig code
As planed, the ofconfig code was moved to platform agent.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2.5.0
2014-04-03 09:31:47 +09:00
FUJITA Tomonori
9dc33e334a apgw: vrrp vrrp_config_change RPC with zero priority goes to backup immediately
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2.4.0
2014-03-30 17:03:52 +09:00
FUJITA Tomonori
7a656668ea apgw: fix VRRP stats log
put contexts into log.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-29 17:10:05 +09:00
FUJITA Tomonori
0b9392c62d apgw: improve query_port_desc_stats RPC API
allows specifying a port number:

query_port_desc_stats [{'port_no':1}]

[{'OFPPort': {'hw_addr': '92:94:19:96:b2:0f', 'curr_speed': 5000, 'curr': 10248, 'name': 'Port1', 'supported': 10248, 'state': 4, 'max_speed': 5000, 'advertised': 10240, 'peer': 10248, 'config': 0, 'port_no': 1}}]

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-29 15:30:20 +09:00
FUJITA Tomonori
0828e2a064 apgw: add 'query_port_desc_stats' method
query_port_desc_stats []

the result are:

[{'OFPPort': {'hw_addr': '92:94:19:96:b2:0f', 'curr_speed': 5000, 'curr': 10248, 'name': 'Port1', 'supported': 10248, 'state': 4, 'max_speed': 5000, 'advertised': 10240, 'peer': 10248, 'config': 0, 'port_no': 1}}, {'OFPPort': {'hw_addr': 'c2:c2:75:9a:70:f1', 'curr_speed': 5000, 'curr': 10248, 'name': 'Port2', 'supported': 10248, 'state': 4, 'max_speed': 5000, 'advertised': 10240, 'peer': 10248, 'config': 0, 'port_no': 2}}]

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-29 14:37:56 +09:00
FUJITA Tomonori
36eba9cd1a apgw: support vrrp_shutdown RPC API
vrrp_shutdown [{'vrid':10}]

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2.3.4
2014-03-29 08:52:21 +09:00
FUJITA Tomonori
6658643120 Revert "apgw: fixed query_secure_channel_state response"
This reverts commit a6cd297c05d25e683dd6ec6c5ac90ad1c98bf865.
2014-03-29 08:14:22 +09:00
FUJITA Tomonori
83e1eb2156 Revert "apgw: fixed secure_channel_state notification"
This reverts commit 43a537fe12ebfa0e2aafcd0985cd3dee87809f87.
2014-03-28 18:05:37 +09:00
FUJITA Tomonori
43a537fe12 apgw: fixed secure_channel_state notification
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-28 17:56:15 +09:00
FUJITA Tomonori
a6cd297c05 apgw: fixed query_secure_channel_state response
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-28 17:47:33 +09:00
FUJITA Tomonori
704efcc20d apgw: add 'query_secure_channel_state' RPC method
The return could be one of them:

[{'secure_channel_state': None}]
[{'secure_channel_state': 'Up'}]
[{'secure_channel_state': 'Down'}]

if no data path connected to ofwire then None
if data path is connected, then 'Up'
if data path connected and later disconnected, then 'Down'

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2.3.3
2014-03-28 17:15:05 +09:00
FUJITA Tomonori
b71fa8148e apgw: fix Flow/Port stats requests from agent
OF1.3 porting regression.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-28 09:05:27 +09:00
Karthik Ramasubramanian
bc35ba0178 Tie oslo.config version
oslo.config > 1.2.1 requires pip >= 1.4 but ubuntu has only 1.1. Tie
oslo.config 1.1.1 so that we continue to use pip 1.1
2.3.2
2014-03-25 17:12:20 -07:00
FUJITA Tomonori
a2106b6676 apgw: add more queue stats unittest
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-25 19:17:57 +09:00
FUJITA Tomonori
e94ee078ee apgw: fix unittest failure
fix unittest failure caused by 5a4d429a6d66b587a8dcee2d7749941df05610b1.

also fix pep8

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-25 19:01:13 +09:00
FUJITA Tomonori
be8f4d656a apgw: specify port_no for queuestats
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-25 19:00:59 +09:00
FUJITA Tomonori
fd81201a52 apgw: fix vrrp rpc API
'ip_address' is a real ip address.
'ip_addr' is a virtual ip address.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2.3.1
2014-03-24 08:31:20 +09:00
Karthik Ramasubramanian
df35e35703 Revert stats log. Only syslog will be used now 2.3.0 2014-03-20 19:02:09 -07:00
Karthik Ramasubramanian
fa709ba75b Add rudimentary retry mechanism for ofcapable switch 2014-03-20 18:42:12 -07:00
Karthik Ramasubramanian
5a4d429a6d Add band name to meter stats 2014-03-20 18:41:44 -07:00
FUJITA Tomonori
690edd4000 apgw: add level info to log format
also fixed unittests.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-14 08:33:47 +09:00
Anantha Ramaiah
f0e9c92f78 This fix addresses the following :-
- fix port status mask to enable port status message reception
- fix packet_in mask to enable invalid_TTL packets to the controller
- This fix *does not* address the TTL packet handling which seems to be broken
2014-03-12 18:29:42 -07:00
FUJITA Tomonori
dca44fee6d apgw: increase ofconfig connection timeout to 180 secs
workaround for netronome startup.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-10 08:45:37 +09:00
Karthik Ramasubramanian
294d84ef33 Re-enable stats logging to separate file 2.2.2 2014-03-08 02:50:28 -08:00
FUJITA Tomonori
78d3ec5a68 apgw: fix unittests for ofwire traceroute
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2.2.1
2014-03-06 22:25:48 +09:00
FUJITA Tomonori
a3fda22167 apgw: fix traceroute notificaiton
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-06 21:56:12 +09:00
FUJITA Tomonori
bf21ed0b0b apgw: make vrrp state change log critical
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2.2.0
2014-03-05 23:25:52 +09:00
FUJITA Tomonori
0edb286f83 apgw: change log level to critical about dp disconnect
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-05 15:04:29 +09:00
FUJITA Tomonori
374f32a20a apgw: vrrp uses physical mac address instead of virtual mac
with --vrrp-use-vmac option, vrrp still uses virtual mac

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-01 17:13:35 +09:00
FUJITA Tomonori
53cfa6dacf apgw: log all stats parameters
Just log all the attributes in OFP*Stats.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2.1.0
2014-02-26 20:45:35 +09:00
FUJITA Tomonori
278bc8fe00 apgw: fix port stats
Support interval per port. refactor to use the same code for port and
queue stats.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-25 17:17:58 +09:00
FUJITA Tomonori
9ce8698b21 apgw: add queue stats support
RPC API:

monitor_queue [{'queue_id': 1, 'interval': 5, 'contexts': {'hello':'world'}}]

if 'interval' is zero, ofwire stops monitoring the specified queue.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-22 10:47:20 +09:00
FUJITA Tomonori
a7b6f0a036 apgw: ofconfig get and edit support
param: {}

{'OFPort': [{'admin-state': 'up', 'name': 'OFP11', 'oper-state': 'down', 'number': 11}], 'OFQueue': [{'max-rate': '10000', 'experimenter': '[4096]', 'id': '1100', 'resource_id': 'QID0-OFP11'}]}

param: [{'port':'OFP11', 'admin-state': 'up'}]

param: [{'queue':'QID0-OFP11', 'max-rate': 10000}]

param: [{'queue': 'QID0-OFP11', 'experimenter': 4096}]

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-15 23:26:12 +09:00
FUJITA Tomonori
3b6842eaed ofconfig: add commit and discard_changes operation support
They are necessary for switches that don't support the feature of
modifying 'running' configuration directly; instead, needs to modify
'candidate' configuration and then commit (or discard).

Also fix do_get method's comment typo.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-15 20:46:04 +09:00
FUJITA Tomonori
dab0aca5cc apgw: add ofconfig oper-state
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-13 20:21:02 +09:00
FUJITA Tomonori
b91a263d07 of_config: add OFPortStateType class
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-13 17:55:08 +09:00
FUJITA Tomonori
1e56302a56 apgw: add initial ofconfig support
suppots getting port information. 'ofconfig' method without parameters
returns:

fujita-air:ryu fujita$ ./bin/rpc-cli --peers=local=localhost:50001
(Cmd) request local ofconfig [{}]
RESULT {'OFPort': [{'admin-state': 'up', 'name': 'Port1', 'number': 1}, {'admin-state': 'up', 'name': 'Port2', 'number': 2}]}

Also added new four command line options to specify the address of
ofconfig-capable switch.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-12 18:25:07 +09:00
FUJITA Tomonori
0f087cefeb apgw: fix log for bogus RPC
write to the proper logger.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2.0.0
2014-02-12 10:34:33 +09:00
FUJITA Tomonori
9131d24c00 apgw: adjust VRRP RPC parameters
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-08 06:33:37 -08:00
FUJITA Tomonori
152ad2ea3e apgw: update the log format
Write to syslog in the proper format.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-08 04:32:49 -08:00
FUJITA Tomonori
9b9208d9e6 test: add vrrp unittests
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-08 20:33:12 +09:00
FUJITA Tomonori
692290fd67 apgw: add Meter suport
- handle MeterMod message
- log meter stats periodically

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07 23:12:31 +09:00
FUJITA Tomonori
87fba4e199 of13: set the default attributes for OFPMeterMod
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07 23:12:08 +09:00
FUJITA Tomonori
393e354b97 apgw: use flowmod JSON used in production
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07 10:28:07 +09:00
FUJITA Tomonori
5b487b165a add the debug code to catch bogus RPC messages
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-06 09:52:44 +09:00
FUJITA Tomonori
208ba0b039 of12: fix InstructionWriteMetadata json decoder
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-06 08:27:15 +09:00
FUJITA Tomonori
a0501a12b1 apgw: add RPC API
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-03 20:28:55 +09:00
FUJITA Tomonori
47ef512494 apgw: add logging library
Will be used by VRRP too.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-03 20:28:04 +09:00
FUJITA Tomonori
eb026768fc apgw: enable syslog logging by default
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-03 20:20:26 +09:00