Optical Additions used in ONOS #416
Conversation
…to optical_experimenter
Conflicts: java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchFields.java java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/CircuitSignalID.java
Conflicts: c_gen/c_test_gen.py java_gen/java_type.py java_gen/pre-written/pom.xml java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchFields.java loxi_ir/ir_offset.py
Tagging 0.4.0.onos
|
Can one of the admins verify this patch? |
openflow_input/calient
Outdated
|
|
||
| enum ofp_calient_ocs_alarm(wire_type=uint8_t, bitmask=True){ | ||
| OFPOCSALM_CLEAR = 1, /* Clear- no alarm */ | ||
| OFPOCSALM_Minor = 2, /* loss is greater than 5.25 */ |
There was a problem hiding this comment.
Should these all be capitalized?
openflow_input/circuit
Outdated
| }; | ||
|
|
||
|
|
||
| struct of_action_circuit : of_action_experimenter { |
There was a problem hiding this comment.
This should inherit from an of_action_<experimenter name> class.
There was a problem hiding this comment.
@leenheer could you have a look at this?
There was a problem hiding this comment.
I don't understand the comment. Care to elaborate?
There was a problem hiding this comment.
We generally add a level to the class hierarchy for each discriminator. of_action_experimenter dispatches to the next level based on the "experimenter" field, and of_action_bsn (for example) dispatches on the "subtype" field.
I think the current code works only because the are no other actions for that experimenter ID.
Please create a new file in openflow_input named after the experimenter (like bsn, nicira, and calient) and add a of_action_ there. Then of_action_circuit (actually of_action__circuit) can inherit from the new class.
|
Overall looks good. I assume it passes The new input files need copyright headers. You can copy from e.g. standard-1.4 and add your copyright to it. |
fixes for javadoc generation.
Proper class hierarchies for LINC optical circuit extensions
|
Can someone help us merge this? |
|
Can you rebase this? |
No description provided.