Added java code formatter and formatting of opflex java files 75/17575/1
authorMartin Sunal <msunal@cisco.com>
Wed, 1 Apr 2015 18:04:30 +0000 (20:04 +0200)
committerMartin Sunal <msunal@cisco.com>
Wed, 1 Apr 2015 18:04:30 +0000 (20:04 +0200)
Java formatter is added groupbasedpolicy/commons/cleanCode/eclipse-java-clean-code-style.xml
Contributors should use this java formatter. It ensures the same look and feel of a code over GBP project.
Java files in opflex renderer have been formatted by this formater.

How to set formatter in Eclipse:
Window -> Preferences
          -> Java
             -> Code Style
                -> Formmater: Import...(eclipse-java-clean-code-style.xml)

Signed-off-by: Martin Sunal <msunal@cisco.com>
47 files changed:
commons/cleanCode/eclipse-java-clean-code-style.xml [new file with mode: 0644]
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/EndpointListener.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/EndpointManager.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/EprContext.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/EprOperation.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/Identity.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/L2EprOperation.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/L3EprOperation.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/MessageUtils.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/OpflexRenderer.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/PolicyManager.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/OpflexAgent.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/OpflexConnectionService.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/OpflexRpcServer.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/Role.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/EndpointDeclareRequest.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/EndpointDeclareResponse.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/EndpointIdentity.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/EndpointResolveRequest.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/EndpointResolveResponse.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/EndpointUndeclareRequest.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/EndpointUndeclareResponse.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/EndpointUnresolveRequest.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/EndpointUnresolveResponse.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/EndpointUpdateRequest.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/EndpointUpdateResponse.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/IdentityRequest.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/IdentityResponse.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/ManagedObject.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/OpflexError.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/PolicyIdentity.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/PolicyResolveRequest.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/PolicyResolveResponse.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/PolicyUnresolveRequest.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/PolicyUnresolveResponse.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/PolicyUpdateRequest.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/PolicyUpdateResponse.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/StateReportRequest.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/lib/messages/StateReportResponse.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/mit/AgentOvsMit.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/mit/EnumInfo.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/mit/MitLib.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/mit/OpflexMit.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/mit/PolicyClassInfo.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/mit/PolicyObjectInstance.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/mit/PolicyPropertyInfo.java
renderers/opflex/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/mit/PolicyUri.java

diff --git a/commons/cleanCode/eclipse-java-clean-code-style.xml b/commons/cleanCode/eclipse-java-clean-code-style.xml
new file mode 100644 (file)
index 0000000..ad2d068
--- /dev/null
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="12">
+<profile kind="CodeFormatterProfile" name="JavaCleanCodeStyle" version="12">
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="84"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="8"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="80"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+</profile>
+</profiles>
index 1639313836f50798fdde75415a570db760d11f70..cd0f5a909c2cdf332f38be09a8374290c9b0c925 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
+ * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -13,15 +13,17 @@ import org.opendaylight.groupbasedpolicy.resolver.EgKey;
 
 /**
  * A listener to events related to endpoints being added, removed or updated.
+ * 
  * @author tbachman
  */
 public interface EndpointListener {
+
     /**
      * An endpoint for an endpoint group have been added, removed,
      * or updated.
+     * 
      * @param egKey the key for the affected endpoint group
      * @param epKey the key for the affected endpoint
-
      */
     public void groupEndpointUpdated(EgKey egKey, EpKey epKey);
 }
index 83aacf1af7de13439292ec5e9dd36f03253a96cb..96766f87f4589bd73bfc270590791068571eba49 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
+ * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -67,28 +67,27 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Keep track of endpoints on the system.  Maintain an index of endpoints
- * and their locations for queries from agents.  The endpoint manager will maintain
+ * Keep track of endpoints on the system. Maintain an index of endpoints
+ * and their locations for queries from agents. The endpoint manager will maintain
  * appropriate indexes only for agents that are attached to the current
  * controller node.
- *
  * In order to render the policy, we need to be able to efficiently enumerate
  * all endpoints on a particular agent and also all the agents containing
  * each particular endpoint group
+ * 
  * @author tbachman
  */
-public class EndpointManager
-        implements AutoCloseable, DataChangeListener, RpcBroker.RpcCallback,
+public class EndpointManager implements AutoCloseable, DataChangeListener, RpcBroker.RpcCallback,
         EprContext.EprCtxCallback {
-    protected static final Logger LOG =
-            LoggerFactory.getLogger(EndpointManager.class);
 
-    private static final InstanceIdentifier<Endpoint> endpointsIid =
-            InstanceIdentifier.builder(Endpoints.class)
-                .child(Endpoint.class).build();
-    private static final InstanceIdentifier<EndpointL3> endpointsL3Iid =
-            InstanceIdentifier.builder(Endpoints.class)
-                .child(EndpointL3.class).build();
+    protected static final Logger LOG = LoggerFactory.getLogger(EndpointManager.class);
+
+    private static final InstanceIdentifier<Endpoint> endpointsIid = InstanceIdentifier.builder(Endpoints.class)
+        .child(Endpoint.class)
+        .build();
+    private static final InstanceIdentifier<EndpointL3> endpointsL3Iid = InstanceIdentifier.builder(Endpoints.class)
+        .child(EndpointL3.class)
+        .build();
 
     final ListenerRegistration<DataChangeListener> listenerReg;
     final ListenerRegistration<DataChangeListener> listenerL3Reg;
@@ -107,26 +106,17 @@ public class EndpointManager
 
     final private DataBroker dataProvider;
 
-    public EndpointManager(DataBroker dataProvider,
-                           RpcProviderRegistry rpcRegistry,
-                           ScheduledExecutorService executor,
-                           OpflexConnectionService connectionService,
-                           MitLib opflexLibrary) {
+    public EndpointManager(DataBroker dataProvider, RpcProviderRegistry rpcRegistry, ScheduledExecutorService executor,
+            OpflexConnectionService connectionService, MitLib opflexLibrary) {
         this.executor = executor;
         this.dataProvider = dataProvider;
         EndpointRpcRegistry.register(dataProvider, rpcRegistry, executor, endpointRpcAug);
 
         if (dataProvider != null) {
-            listenerReg = dataProvider
-                    .registerDataChangeListener(LogicalDatastoreType.OPERATIONAL,
-                                                endpointsIid,
-                                                this,
-                                                DataChangeScope.ONE);
-            listenerL3Reg = dataProvider
-                    .registerDataChangeListener(LogicalDatastoreType.OPERATIONAL,
-                                                endpointsL3Iid,
-                                                this,
-                                                DataChangeScope.ONE);
+            listenerReg = dataProvider.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, endpointsIid, this,
+                    DataChangeScope.ONE);
+            listenerL3Reg = dataProvider.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, endpointsL3Iid,
+                    this, DataChangeScope.ONE);
         } else {
             listenerReg = null;
             listenerL3Reg = null;
@@ -142,7 +132,7 @@ public class EndpointManager
         messageMap = new RpcMessageMap();
         List<RpcMessage> messages = Role.ENDPOINT_REGISTRY.getMessages();
         messageMap.addList(messages);
-        for (RpcMessage msg: messages) {
+        for (RpcMessage msg : messages) {
             this.connectionService.subscribe(msg, this);
         }
         LOG.trace("Initialized OpFlex endpoint manager");
@@ -150,7 +140,6 @@ public class EndpointManager
 
     /**
      * Shut down the {@link EndpointManager}
-     *
      */
     public void shutdown() {
 
@@ -162,6 +151,7 @@ public class EndpointManager
 
     /**
      * Get the endpoint object for the given key
+     * 
      * @param epKey the key
      * @return the {@link Endpoint} corresponding to the key
      */
@@ -169,28 +159,21 @@ public class EndpointManager
         return endpoints.get(epKey);
     }
 
-
     // ************************
     // Endpoint Augmentation
     // ************************
     private class OfEndpointAug implements EpRendererAugmentation {
 
         @Override
-        public void buildEndpointAugmentation(EndpointBuilder eb,
-                RegisterEndpointInput input) {
-            OpflexOverlayContextInput ictx = input
-                    .getAugmentation(OpflexOverlayContextInput.class);
-            eb.addAugmentation(OpflexOverlayContext.class,
-                    new OpflexOverlayContextBuilder(ictx).build());
+        public void buildEndpointAugmentation(EndpointBuilder eb, RegisterEndpointInput input) {
+            OpflexOverlayContextInput ictx = input.getAugmentation(OpflexOverlayContextInput.class);
+            eb.addAugmentation(OpflexOverlayContext.class, new OpflexOverlayContextBuilder(ictx).build());
         }
 
         @Override
-        public void buildEndpointL3Augmentation(EndpointL3Builder eb,
-                RegisterEndpointInput input) {
-            OpflexOverlayContextInput ictx = input
-                    .getAugmentation(OpflexOverlayContextInput.class);
-            eb.addAugmentation(OpflexOverlayContextL3.class,
-                    new OpflexOverlayContextL3Builder(ictx).build());
+        public void buildEndpointL3Augmentation(EndpointL3Builder eb, RegisterEndpointInput input) {
+            OpflexOverlayContextInput ictx = input.getAugmentation(OpflexOverlayContextInput.class);
+            eb.addAugmentation(OpflexOverlayContextL3.class, new OpflexOverlayContextL3Builder(ictx).build());
         }
     }
 
@@ -200,7 +183,8 @@ public class EndpointManager
 
     @Override
     public void close() throws Exception {
-        if (listenerReg != null) listenerReg.close();
+        if (listenerReg != null)
+            listenerReg.close();
         EndpointRpcRegistry.unregister(endpointRpcAug);
     }
 
@@ -219,20 +203,20 @@ public class EndpointManager
             if (old != null && old instanceof Endpoint)
                 updateEndpoint(old, null);
         }
-        Map<InstanceIdentifier<?>,DataObject> d = change.getUpdatedData();
+        Map<InstanceIdentifier<?>, DataObject> d = change.getUpdatedData();
         for (Entry<InstanceIdentifier<?>, DataObject> entry : d.entrySet()) {
-            if ((!(entry.getValue() instanceof Endpoint)) &&
-                (!(entry.getValue() instanceof EndpointL3))) continue;
+            if ((!(entry.getValue() instanceof Endpoint)) && (!(entry.getValue() instanceof EndpointL3)))
+                continue;
             DataObject old = change.getOriginalData().get(entry.getKey());
             DataObject oldEp = null;
-            if (entry instanceof Endpoint ||
-                entry instanceof EndpointL3) {
+            if (entry instanceof Endpoint || entry instanceof EndpointL3) {
                 if (old != null && old instanceof Endpoint)
                     oldEp = old;
                 updateEndpoint(oldEp, entry.getValue());
             }
         }
     }
+
     // **************
     // Implementation
     // **************
@@ -240,13 +224,13 @@ public class EndpointManager
     private Identity getIdentity(DataObject obj) {
         Identity id = null;
         if (obj instanceof Endpoint) {
-            Endpoint ep = (Endpoint)obj;
+            Endpoint ep = (Endpoint) obj;
             id = new Identity(ep);
             id.setContext(ep.getL2Context().getValue());
         }
 
         if (obj instanceof EndpointL3) {
-            EndpointL3 ep = (EndpointL3)obj;
+            EndpointL3 ep = (EndpointL3) obj;
             id = new Identity(ep);
             id.setContext(ep.getL3Context().getValue());
         }
@@ -257,11 +241,11 @@ public class EndpointManager
     }
 
     private synchronized Set<String> getEpSubscriptions(String id) {
-       return epSubscriptions.get(id);
+        return epSubscriptions.get(id);
     }
 
     /**
-     *  Provide endpoint policy update messages based on changes
+     * Provide endpoint policy update messages based on changes
      */
     protected void updateEndpoint(DataObject oldEp, DataObject newEp) {
         Identity oldId = getIdentity(oldEp);
@@ -280,9 +264,7 @@ public class EndpointManager
                 for (String agentId : agentList) {
                     OpflexAgent agent = connectionService.getOpflexAgent(agentId);
                     if (agent != null) {
-                        updateQ.add(new EndpointUpdate(EndpointUpdate.UpdateType.ADD_CHANGE,
-                                    agent.getEndpoint(),
-                                    newEp));
+                        updateQ.add(new EndpointUpdate(EndpointUpdate.UpdateType.ADD_CHANGE, agent.getEndpoint(), newEp));
                     }
                 }
             }
@@ -294,9 +276,7 @@ public class EndpointManager
                 for (String agentId : agentList) {
                     OpflexAgent agent = connectionService.getOpflexAgent(agentId);
                     if (agent != null) {
-                        updateQ.add(new EndpointUpdate(EndpointUpdate.UpdateType.DELETE,
-                                    agent.getEndpoint(),
-                                    oldEp));
+                        updateQ.add(new EndpointUpdate(EndpointUpdate.UpdateType.DELETE, agent.getEndpoint(), oldEp));
                     }
                 }
             }
@@ -306,39 +286,37 @@ public class EndpointManager
     }
 
     private static class EndpointUpdate implements Runnable {
-       public static enum UpdateType {
-               ADD_CHANGE("add_change"),
-               DELETE("delete");
 
-               private String updateType;
+        public static enum UpdateType {
+            ADD_CHANGE("add_change"), DELETE("delete");
 
-               UpdateType(String updateType) {
-                       this.updateType = updateType;
-               }
+            private String updateType;
 
-               @Override
-               public String toString() {
-                       return this.updateType;
-               }
-       }
+            UpdateType(String updateType) {
+                this.updateType = updateType;
+            }
 
-       private final UpdateType type;
+            @Override
+            public String toString() {
+                return this.updateType;
+            }
+        }
+
+        private final UpdateType type;
         private final JsonRpcEndpoint agent;
         private final ManagedObject mo;
+
         EndpointUpdate(UpdateType type, JsonRpcEndpoint agent, DataObject obj) {
-               this.type = type;
+            this.type = type;
             this.agent = agent;
             mo = MessageUtils.getMoFromEp(obj);
         }
 
         @Override
         public void run() {
-            EndpointUpdateRequest request =
-                    new EndpointUpdateRequest();
-            EndpointUpdateRequest.Params params =
-                    new EndpointUpdateRequest.Params();
-            List<EndpointUpdateRequest.Params> paramList =
-                    new ArrayList<EndpointUpdateRequest.Params>();
+            EndpointUpdateRequest request = new EndpointUpdateRequest();
+            EndpointUpdateRequest.Params params = new EndpointUpdateRequest.Params();
+            List<EndpointUpdateRequest.Params> paramList = new ArrayList<EndpointUpdateRequest.Params>();
 
             // TODO: how do we get delete URIs from the
             // normalized policy?
@@ -350,8 +328,7 @@ public class EndpointManager
             }
             if (type == EndpointUpdate.UpdateType.ADD_CHANGE) {
                 params.setReplace(replace);
-            }
-            else if (type == EndpointUpdate.UpdateType.DELETE) {
+            } else if (type == EndpointUpdate.UpdateType.DELETE) {
                 params.setDelete_uri(delete_uri);
             }
 
@@ -359,8 +336,7 @@ public class EndpointManager
             request.setParams(paramList);
             try {
                 agent.sendRequest(request);
-            }
-            catch (Throwable t) {
+            } catch (Throwable t) {
 
             }
 
@@ -374,95 +350,90 @@ public class EndpointManager
         }
     }
 
-       /**
+    /**
      * Create an Endpoint Registry Context for an OpFlex
      * Request message.
      *
-        * @param agent
-        * @param request
-        * @param dataProvider
-        * @param executor
-        * @return
-        */
-    public EprContext create(JsonRpcEndpoint agent,
-                             RpcMessage message,
-                             DataBroker dataProvider,
-                             ScheduledExecutorService executor) {
-
-       EprContext ec = null;
-
-       if (message instanceof EndpointDeclareRequest) {
-               EndpointDeclareRequest request = (EndpointDeclareRequest)message;
-               /*
-                * There theoretically could be a list of parameters,
-                * but we'll likely only ever see one element.
-                */
-               ec = new EprContext(agent, request, dataProvider, executor);
-               for (EndpointDeclareRequest.Params params : request.getParams()) {
-
-                       int prr = params.getPrr();
-
-                   /*
-                        * We have a list of endpoints, so iterate through the
-                        * list and register each one, extracting the identities
-                        * for registration.
-                        */
-                       List<ManagedObject> endpoints = params.getEndpoint();
-                       if (endpoints != null) {
-                               for (ManagedObject mo: endpoints) {
-                                       EprOperation eo =
-                                               MessageUtils.getEprOpFromEpMo(mo, prr, agent.getIdentifier());
-                                       ec.addOperation(eo);
-                               }
-                       }
-               }
-       }
-       else if (message instanceof EndpointUndeclareRequest) {
-               EndpointUndeclareRequest request = (EndpointUndeclareRequest)message;
-               ec = new EprContext(agent, request, dataProvider, executor);
-               for (EndpointUndeclareRequest.Params params : request.getParams()) {
-
-                       /*
-                        * A single URI is provided per param in Undeclare messages
-                        */
-                       String subject = params.getSubject();
-               Uri uri = params.getEndpoint_uri();
-               if (uri != null) {
-                       EprOperation op = MessageUtils.getEprOpFromUri(uri, subject);
-                       ec.addOperation(op);
-               }
-               }
-        }
-       else if (message instanceof EndpointResolveRequest) {
-               EndpointResolveRequest request = (EndpointResolveRequest)message;
-               ec = new EprContext(agent, request, dataProvider, executor);
-               for (EndpointResolveRequest.Params params: request.getParams()) {
-               /*
-                * The resolve message contains either the URI
-                * or a context/URI and an identifier. There is only
-                * one of these per param array entry.
-                */
-               EndpointIdentity eid = params.getEndpoint_ident();
-
-               String subject = params.getSubject();
-
-               if (eid != null) {
-
-                       EprOperation op = MessageUtils.getEprOpFromEpId(eid, subject);
-                       ec.addOperation(op);
-
-               } else {
-                   /*
-                    * Extract the list to add the EP to from
-                    * the URI
-                    */
-                   Uri uri = params.getEndpoint_uri();
-                       if (uri != null) {
-                               EprOperation op = MessageUtils.getEprOpFromUri(uri, subject);
-                               ec.addOperation(op);
-                       }
-               }
-               }
+     * @param agent
+     * @param request
+     * @param dataProvider
+     * @param executor
+     * @return
+     */
+    public EprContext create(JsonRpcEndpoint agent, RpcMessage message, DataBroker dataProvider,
+            ScheduledExecutorService executor) {
+
+        EprContext ec = null;
+
+        if (message instanceof EndpointDeclareRequest) {
+            EndpointDeclareRequest request = (EndpointDeclareRequest) message;
+            /*
+             * There theoretically could be a list of parameters,
+             * but we'll likely only ever see one element.
+             */
+            ec = new EprContext(agent, request, dataProvider, executor);
+            for (EndpointDeclareRequest.Params params : request.getParams()) {
+
+                int prr = params.getPrr();
+
+                /*
+                 * We have a list of endpoints, so iterate through the
+                 * list and register each one, extracting the identities
+                 * for registration.
+                 */
+                List<ManagedObject> endpoints = params.getEndpoint();
+                if (endpoints != null) {
+                    for (ManagedObject mo : endpoints) {
+                        EprOperation eo = MessageUtils.getEprOpFromEpMo(mo, prr, agent.getIdentifier());
+                        ec.addOperation(eo);
+                    }
+                }
+            }
+        } else if (message instanceof EndpointUndeclareRequest) {
+            EndpointUndeclareRequest request = (EndpointUndeclareRequest) message;
+            ec = new EprContext(agent, request, dataProvider, executor);
+            for (EndpointUndeclareRequest.Params params : request.getParams()) {
+
+                /*
+                 * A single URI is provided per param in Undeclare messages
+                 */
+                String subject = params.getSubject();
+                Uri uri = params.getEndpoint_uri();
+                if (uri != null) {
+                    EprOperation op = MessageUtils.getEprOpFromUri(uri, subject);
+                    ec.addOperation(op);
+                }
+            }
+        } else if (message instanceof EndpointResolveRequest) {
+            EndpointResolveRequest request = (EndpointResolveRequest) message;
+            ec = new EprContext(agent, request, dataProvider, executor);
+            for (EndpointResolveRequest.Params params : request.getParams()) {
+                /*
+                 * The resolve message contains either the URI
+                 * or a context/URI and an identifier. There is only
+                 * one of these per param array entry.
+                 */
+                EndpointIdentity eid = params.getEndpoint_ident();
+
+                String subject = params.getSubject();
+
+                if (eid != null) {
+
+                    EprOperation op = MessageUtils.getEprOpFromEpId(eid, subject);
+                    ec.addOperation(op);
+
+                } else {
+                    /*
+                     * Extract the list to add the EP to from
+                     * the URI
+                     */
+                    Uri uri = params.getEndpoint_uri();
+                    if (uri != null) {
+                        EprOperation op = MessageUtils.getEprOpFromUri(uri, subject);
+                        ec.addOperation(op);
+                    }
+                }
+            }
         }
         return ec;
     }
@@ -473,7 +444,7 @@ public class EndpointManager
             agents = Collections.newSetFromMap(new ConcurrentHashMap<String, Boolean>());
             Set<String> result = epSubscriptions.putIfAbsent(id, agents);
             if (result != null) {
-               agents = result;
+                agents = result;
             }
         }
         agents.add(agent.getIdentifier());
@@ -482,7 +453,7 @@ public class EndpointManager
     private synchronized void removeEpSubscription(JsonRpcEndpoint agent, String id) {
         Set<String> agents = epSubscriptions.get(id);
         if (agents != null) {
-               agents.remove(id);
+            agents.remove(id);
         }
     }
 
@@ -510,8 +481,7 @@ public class EndpointManager
          */
 
         if (request instanceof EndpointDeclareRequest) {
-            EndpointDeclareRequest req = (EndpointDeclareRequest)request;
-
+            EndpointDeclareRequest req = (EndpointDeclareRequest) request;
 
             /*
              * valid() ensures presence of params and MOs, so we know those
@@ -538,9 +508,8 @@ public class EndpointManager
             EprContext ctx = create(agent, req, dataProvider, executor);
             ctx.setCallback(this);
             ctx.createEp();
-        }
-        else if (request instanceof EndpointUndeclareRequest) {
-            EndpointUndeclareRequest req = (EndpointUndeclareRequest)request;
+        } else if (request instanceof EndpointUndeclareRequest) {
+            EndpointUndeclareRequest req = (EndpointUndeclareRequest) request;
 
             /*
              * valid() ensures presence of params and URIs, so we know those
@@ -567,19 +536,17 @@ public class EndpointManager
             EprContext ctx = create(agent, req, dataProvider, executor);
             ctx.setCallback(this);
             ctx.deleteEp();
-        }
-        else if (request instanceof EndpointResolveRequest) {
-            EndpointResolveRequest req = (EndpointResolveRequest)request;
+        } else if (request instanceof EndpointResolveRequest) {
+            EndpointResolveRequest req = (EndpointResolveRequest) request;
 
             if (!req.valid()) {
                 LOG.warn("Invalid endpoint request: {}", req);
                 // TODO: should return error reply?
                 return;
             }
-            List<EndpointResolveRequest.Params> paramList =
-                       req.getParams();
+            List<EndpointResolveRequest.Params> paramList = req.getParams();
 
-            for (EndpointResolveRequest.Params param: paramList) {
+            for (EndpointResolveRequest.Params param : paramList) {
                 EprContext ctx = create(agent, req, dataProvider, executor);
 
                 /*
@@ -596,20 +563,17 @@ public class EndpointManager
                 Identity id = null;
                 if (param.getEndpoint_ident() != null) {
                     id = new Identity(param.getEndpoint_ident().getIdentifier());
-                }
-                else if (param.getEndpoint_uri() != null) {
-                       PolicyUri puri = new PolicyUri(param.getEndpoint_uri().getValue());
-                   id = new Identity(puri.pop());
-                }
-                else {
-                       // TOOD: should return error reply
-                       return;
+                } else if (param.getEndpoint_uri() != null) {
+                    PolicyUri puri = new PolicyUri(param.getEndpoint_uri().getValue());
+                    id = new Identity(puri.pop());
+                } else {
+                    // TOOD: should return error reply
+                    return;
                 }
                 addEpSubscription(agent, id.identityAsString());
             }
-        }
-        else if (request instanceof EndpointUnresolveRequest) {
-               EndpointUnresolveRequest req = (EndpointUnresolveRequest)request;
+        } else if (request instanceof EndpointUnresolveRequest) {
+            EndpointUnresolveRequest req = (EndpointUnresolveRequest) request;
 
             if (!req.valid()) {
                 LOG.warn("Invalid endpoint request: {}", req);
@@ -617,10 +581,9 @@ public class EndpointManager
                 return;
             }
 
-               List<EndpointUnresolveRequest.Params> params =
-                               ((EndpointUnresolveRequest) request).getParams();
+            List<EndpointUnresolveRequest.Params> params = ((EndpointUnresolveRequest) request).getParams();
 
-               for (EndpointUnresolveRequest.Params param: params) {
+            for (EndpointUnresolveRequest.Params param : params) {
                 /*
                  * No interaction with the Data Store is required -- just
                  * cancel the notification subscription for this EP..
@@ -628,37 +591,31 @@ public class EndpointManager
                 Identity id = null;
                 if (param.getEndpoint_ident() != null) {
                     id = new Identity(param.getEndpoint_ident().getIdentifier());
-                }
-                else if (param.getEndpoint_uri() != null) {
-                       PolicyUri puri = new PolicyUri(param.getEndpoint_uri().getValue());
-                   id = new Identity(puri.pop());
-                }
-                else {
-                       // TOODO: should return an error
-                       return;
+                } else if (param.getEndpoint_uri() != null) {
+                    PolicyUri puri = new PolicyUri(param.getEndpoint_uri().getValue());
+                    id = new Identity(puri.pop());
+                } else {
+                    // TOODO: should return an error
+                    return;
                 }
                 removeEpSubscription(agent, id.identityAsString());
-               }
+            }
 
             /*
              * No EprContext is used in unresolve -- so
              * just send the response directly
              */
-            EndpointUnresolveResponse resp =
-                    new EndpointUnresolveResponse();
-            EndpointUnresolveResponse.Result result =
-                    new EndpointUnresolveResponse.Result();
+            EndpointUnresolveResponse resp = new EndpointUnresolveResponse();
+            EndpointUnresolveResponse.Result result = new EndpointUnresolveResponse.Result();
             resp.setResult(result);
             resp.setId(req.getId());
             try {
                 agent.sendResponse(resp);
-            }
-            catch (Throwable t) {
+            } catch (Throwable t) {
                 LOG.warn("Response {} could not be sent to {}", resp, agent);
             }
 
-        }
-        else {
+        } else {
             LOG.warn("Unexpected callback, {}", request);
         }
 
@@ -668,6 +625,7 @@ public class EndpointManager
 
         private EprContext ctx;
         private RpcMessage resp;
+
         public EndpointResponse(EprContext ctx, RpcMessage resp) {
             this.ctx = ctx;
             this.resp = resp;
@@ -694,79 +652,70 @@ public class EndpointManager
      */
     @Override
     public void callback(EprContext ctx) {
-       RpcMessage resp = null;
-       if (ctx.getRequest() == null) return;
+        RpcMessage resp = null;
+        if (ctx.getRequest() == null)
+            return;
 
-        if (!(ctx.getRequest() instanceof EndpointDeclareRequest) &&
-            !(ctx.getRequest() instanceof EndpointUndeclareRequest) &&
-           !(ctx.getRequest() instanceof EndpointResolveRequest)) {
+        if (!(ctx.getRequest() instanceof EndpointDeclareRequest)
+                && !(ctx.getRequest() instanceof EndpointUndeclareRequest)
+                && !(ctx.getRequest() instanceof EndpointResolveRequest)) {
             return;
         }
 
-       if (ctx.getRequest() instanceof EndpointDeclareRequest) {
-               EndpointDeclareRequest req =
-                               (EndpointDeclareRequest)ctx.getRequest();
-               EndpointDeclareResponse response = new EndpointDeclareResponse();
-               EndpointDeclareResponse.Result result =
-                               new EndpointDeclareResponse.Result();
+        if (ctx.getRequest() instanceof EndpointDeclareRequest) {
+            EndpointDeclareRequest req = (EndpointDeclareRequest) ctx.getRequest();
+            EndpointDeclareResponse response = new EndpointDeclareResponse();
+            EndpointDeclareResponse.Result result = new EndpointDeclareResponse.Result();
             response.setResult(result);
             response.setId(req.getId());
             response.setError(null); // TODO: real errors
             resp = response;
-       }
-       else if (ctx.getRequest() instanceof EndpointUndeclareRequest) {
-               EndpointUndeclareRequest req =
-                               (EndpointUndeclareRequest)ctx.getRequest();
-               EndpointUndeclareResponse response = new EndpointUndeclareResponse();
-               EndpointUndeclareResponse.Result result =
-                               new EndpointUndeclareResponse.Result();
+        } else if (ctx.getRequest() instanceof EndpointUndeclareRequest) {
+            EndpointUndeclareRequest req = (EndpointUndeclareRequest) ctx.getRequest();
+            EndpointUndeclareResponse response = new EndpointUndeclareResponse();
+            EndpointUndeclareResponse.Result result = new EndpointUndeclareResponse.Result();
             response.setResult(result);
             response.setId(req.getId());
             response.setError(null); // TODO: real errors
             resp = response;
-       }
-       else {
-               EndpointResolveRequest req =
-                       (EndpointResolveRequest)ctx.getRequest();
-               EndpointResolveResponse response = new EndpointResolveResponse();
-               response.setId(req.getId());
-               EndpointResolveResponse.Result result =
-                       new EndpointResolveResponse.Result();
-               List<ManagedObject> epList =
-                       new ArrayList<ManagedObject>();
-
-
-               if (ctx.getOperations().size() > 0) {
-
-                   /*
-                    * If we get any EP, then we can
-                    * provide a response to the original request
-                    * Note that we could potentially have multiple
-                    * requests outstanding for the same EP, and
-                    * even using different context types (L2 or L3).
-                    */
-                       for (EprOperation op: ctx.getOperations()) {
-
-                       ManagedObject mo = MessageUtils.getMoFromOp(op);
-                       if (mo != null) {
-                           epList.add(mo);
-                       }
-                       /*
-                        * For EPs on a different agent, we need to look up the
-                        * VTEP information. For now, we're only supporting
-                        * VXLAN VTEPs, so we look up the destination tunnel IP,
-                        * and provide that in the data field of the response
-                        */
-                       // TODO: Need to look this up in op store
-                       //endpoint.setData();
-                   }
-                   result.setEndpoint(epList);
-                   response.setResult(result);
-                   resp = response;
-               }
+        } else {
+            EndpointResolveRequest req = (EndpointResolveRequest) ctx.getRequest();
+            EndpointResolveResponse response = new EndpointResolveResponse();
+            response.setId(req.getId());
+            EndpointResolveResponse.Result result = new EndpointResolveResponse.Result();
+            List<ManagedObject> epList = new ArrayList<ManagedObject>();
+
+            if (ctx.getOperations().size() > 0) {
+
+                /*
+                 * If we get any EP, then we can
+                 * provide a response to the original request
+                 * Note that we could potentially have multiple
+                 * requests outstanding for the same EP, and
+                 * even using different context types (L2 or L3).
+                 */
+                for (EprOperation op : ctx.getOperations()) {
+
+                    ManagedObject mo = MessageUtils.getMoFromOp(op);
+                    if (mo != null) {
+                        epList.add(mo);
+                    }
+                    /*
+                     * For EPs on a different agent, we need to look up the
+                     * VTEP information. For now, we're only supporting
+                     * VXLAN VTEPs, so we look up the destination tunnel IP,
+                     * and provide that in the data field of the response
+                     */
+                    // TODO: Need to look this up in op store
+                    // endpoint.setData();
+                }
+                result.setEndpoint(epList);
+                response.setResult(result);
+                resp = response;
+            }
         }
         if (resp != null) {
             executor.execute(new EndpointResponse(ctx, resp));
-       }
+        }
     }
 }
index 008d12eab63c22d5a47f416a3a8d15dbe5195a3f..0c580d890ba87f0cae7816760d2616513f34a7d0 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
+ * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -29,9 +29,9 @@ import com.google.common.util.concurrent.CheckedFuture;
  * used to send responses
  *
  * @author tbachman
- *
  */
 public class EprContext implements Runnable, EprOperation.EprOpCallback {
+
     private EprCtxCallback cb;
     private final DataBroker dataProvider;
     private final ScheduledExecutorService executor;
@@ -41,8 +41,8 @@ public class EprContext implements Runnable, EprOperation.EprOpCallback {
     private AtomicReference<Integer> completedOperations;
     private CheckedFuture<Void, TransactionCommitFailedException> f;
 
-    public EprContext(JsonRpcEndpoint peer, RpcMessage request,
-            DataBroker dataProvider, ScheduledExecutorService executor) {
+    public EprContext(JsonRpcEndpoint peer, RpcMessage request, DataBroker dataProvider,
+            ScheduledExecutorService executor) {
         this.dataProvider = dataProvider;
         this.executor = executor;
         this.peer = peer;
@@ -74,9 +74,9 @@ public class EprContext implements Runnable, EprOperation.EprOpCallback {
      * EPR.
      *
      * @author tbachman
-     *
      */
     public static interface EprCtxCallback {
+
         public void callback(EprContext ctx);
     }
 
@@ -91,7 +91,6 @@ public class EprContext implements Runnable, EprOperation.EprOpCallback {
     /**
      * Create an Endpoint in the Endopint Registry. This can only be called in
      * response to an {@link EndpointDeclareRequest} message
-     *
      */
     public void createEp() {
 
@@ -113,7 +112,6 @@ public class EprContext implements Runnable, EprOperation.EprOpCallback {
     /**
      * Delete an Endpoint in the Endpoint Registry. This can only be called in
      * response to an {@link EndpointUndeclareRequest} message
-     *
      */
     public void deleteEp() {
 
@@ -136,7 +134,6 @@ public class EprContext implements Runnable, EprOperation.EprOpCallback {
      * response to an {@link EndpointResolveRequest} message. It initiates all
      * of the reads, one by one, and invokes the callback when all of them have
      * completed.
-     *
      */
     public void lookupEndpoint() {
 
@@ -145,8 +142,7 @@ public class EprContext implements Runnable, EprOperation.EprOpCallback {
          * for each operation, so we can determine when all of the read
          * operations have completed.
          */
-        this.completedOperations = new AtomicReference<Integer>(
-                Integer.valueOf(0));
+        this.completedOperations = new AtomicReference<Integer>(Integer.valueOf(0));
         if (operations != null) {
             for (EprOperation eo : operations) {
                 ReadOnlyTransaction rot = dataProvider.newReadOnlyTransaction();
@@ -173,7 +169,6 @@ public class EprContext implements Runnable, EprOperation.EprOpCallback {
 
     /**
      * This implements the callback for the lookup operation.
-     *
      */
     @Override
     public void callback(EprOperation op) {
index a5e4c59927a5a2c11e1e53cced9ad81395552cdd..c1c0f7726e1333637d07aa6395561aa15390200a 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
+ * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -20,17 +20,17 @@ import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
  * operations are supported.
  *
  * @author thbachma
- *
  */
 public interface EprOperation {
-       /**
-        * Callback interface used to provide notifications
-        * to other objects.
-        *
-        * @author thbachma
-        *
-        */
+
+    /**
+     * Callback interface used to provide notifications
+     * to other objects.
+     *
+     * @author thbachma
+     */
     public interface EprOpCallback {
+
         public void callback(EprOperation op);
     }
 
@@ -41,28 +41,27 @@ public interface EprOperation {
      *
      * @param wt
      */
-       public void put(WriteTransaction wt);
+    public void put(WriteTransaction wt);
 
-       /**
-        * Perform a DELETE operation for the requested Endpoint.
-        *
-        * @param wt
-        */
-       public void delete(WriteTransaction wt);
+    /**
+     * Perform a DELETE operation for the requested Endpoint.
+     *
+     * @param wt
+     */
+    public void delete(WriteTransaction wt);
 
-       /**
-        * Return the data associated with the requested Endpoint.
-        *
-        * @param rot
-        * @param executor
-        */
-       public void read(ReadOnlyTransaction rot,
-                       ScheduledExecutorService executor);
+    /**
+     * Return the data associated with the requested Endpoint.
+     *
+     * @param rot
+     * @param executor
+     */
+    public void read(ReadOnlyTransaction rot, ScheduledExecutorService executor);
 
-       /**
-        * Set the callback notification
-        *
-        * @param callback
-        */
-       public void setCallback(EprOpCallback callback);
+    /**
+     * Set the callback notification
+     *
+     * @param callback
+     */
+    public void setCallback(EprOpCallback callback);
 }
index e3d7f66cb2d987a08d4a0424bba5b7c3dbafd190..61d1040e596b0ae2a7676b7274b9def19e240b2e 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
+ * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -27,30 +27,30 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.r
 
 import com.google.common.net.InetAddresses;
 
-
 /**
  * An Identity for OpFlex. Identities can take on many
  * forms, so it's possible that this class may be replaced
  * by an abstract class with different concrete types.
  * At the moment, we're only dealing with IP and MAC
  * addresses.
- *
  * This class also provides methods for getting the identity
  * in forms by the yang model, and are therefore usable by
  * other classes in the policy model (e.g. the objects
  * needed by the Endpoint Registry).
- *
  */
 public class Identity {
+
     enum IdentityType {
         UNKNOWN, IP_ADDRESS, MAC_ADDRESS;
     }
+
     private IdentityType type = IdentityType.UNKNOWN;
     private L3ContextId l3Context = null;
     private IpAddress primaryIp = null;
     private Set<IpAddress> ips = null;
     private L2BridgeDomainId l2Context = null;
     private MacAddress mac = null;
+
     public Identity(String id) {
         /*
          * Determine the ID type and populate
@@ -58,10 +58,10 @@ public class Identity {
         if (idIsIp(id)) {
             type = IdentityType.IP_ADDRESS;
             ips = Collections.newSetFromMap(new ConcurrentHashMap<IpAddress, Boolean>());
-            if (primaryIp == null) primaryIp = normalizeIpAddress(id);
+            if (primaryIp == null)
+                primaryIp = normalizeIpAddress(id);
             ips.add(normalizeIpAddress(id));
-        }
-        else if (idIsMac(id)) {
+        } else if (idIsMac(id)) {
             type = IdentityType.MAC_ADDRESS;
             mac = normalizeMacAddress(id);
         }
@@ -79,21 +79,21 @@ public class Identity {
         ips = Collections.newSetFromMap(new ConcurrentHashMap<IpAddress, Boolean>());
         primaryIp = ep.getIpAddress();
         List<L3Address> l3List = ep.getL3Address();
-        for (L3Address addr: l3List) {
+        for (L3Address addr : l3List) {
             ips.add(addr.getIpAddress());
         }
     }
 
     public void setContext(String context) {
         switch (type) {
-        case MAC_ADDRESS:
-            l2Context = new L2BridgeDomainId(context);
-            break;
-        case IP_ADDRESS:
-            l3Context = new L3ContextId(context);
-            break;
-        default:
-            break;
+            case MAC_ADDRESS:
+                l2Context = new L2BridgeDomainId(context);
+                break;
+            case IP_ADDRESS:
+                l3Context = new L3ContextId(context);
+                break;
+            default:
+                break;
         }
     }
 
@@ -105,11 +105,11 @@ public class Identity {
      */
     public void addId(String id) {
         switch (type) {
-        case IP_ADDRESS:
-            ips.add(normalizeIpAddress(id));
-            break;
-        default:
-            break;
+            case IP_ADDRESS:
+                ips.add(normalizeIpAddress(id));
+                break;
+            default:
+                break;
         }
     }
 
@@ -139,7 +139,7 @@ public class Identity {
         for (String field : sixFields) {
             /* Strip '0x' if present */
             field = field.replace("0x", "");
-            if (field.length() > 2 || field.length() <1) {
+            if (field.length() > 2 || field.length() < 1) {
                 return false;
             }
             if (!Pattern.matches("[0-9a-fA-F]{1,2}", field)) {
@@ -169,21 +169,22 @@ public class Identity {
 
     public boolean valid() {
         switch (type) {
-        case MAC_ADDRESS:
-            if (getL2Context() != null && mac != null) {
-                return true;
-            }
-            break;
-        case IP_ADDRESS:
-            if (getL3Context() != null && primaryIp != null) {
-                return true;
-            }
+            case MAC_ADDRESS:
+                if (getL2Context() != null && mac != null) {
+                    return true;
+                }
+                break;
+            case IP_ADDRESS:
+                if (getL3Context() != null && primaryIp != null) {
+                    return true;
+                }
             default:
                 break;
 
         }
         return false;
     }
+
     /**
      * Return the context, regardless of type, as a string.
      *
@@ -191,12 +192,12 @@ public class Identity {
      */
     public String contextAsString() {
         switch (type) {
-        case MAC_ADDRESS:
-            return l2Context.getValue().toString();
-        case IP_ADDRESS:
-            return l3Context.getValue().toString();
-        default:
-            return null;
+            case MAC_ADDRESS:
+                return l2Context.getValue().toString();
+            case IP_ADDRESS:
+                return l3Context.getValue().toString();
+            default:
+                return null;
         }
     }
 
@@ -210,18 +211,17 @@ public class Identity {
      */
     public String identityAsString() {
         switch (type) {
-        case MAC_ADDRESS:
-            return mac.getValue();
-        case IP_ADDRESS:
-            List<IpAddress> ipl = new ArrayList<IpAddress>(ips);
-            IpAddress i = ipl.get(0);
-            if (i.getIpv4Address() != null) {
-                return i.getIpv4Address().getValue();
-            }
-            else if (i.getIpv6Address() != null) {
-                return i.getIpv6Address().getValue();
-            }
-        default:
+            case MAC_ADDRESS:
+                return mac.getValue();
+            case IP_ADDRESS:
+                List<IpAddress> ipl = new ArrayList<IpAddress>(ips);
+                IpAddress i = ipl.get(0);
+                if (i.getIpv4Address() != null) {
+                    return i.getIpv4Address().getValue();
+                } else if (i.getIpv6Address() != null) {
+                    return i.getIpv6Address().getValue();
+                }
+            default:
         }
         return null;
     }
@@ -268,10 +268,10 @@ public class Identity {
 
     public List<L3Address> getL3Addresses() {
 
-        List<L3Address> l3List= new ArrayList<L3Address>();
+        List<L3Address> l3List = new ArrayList<L3Address>();
         List<IpAddress> ipList = new ArrayList<IpAddress>();
         ipList.addAll(ips);
-        for (IpAddress i: ipList){
+        for (IpAddress i : ipList) {
             L3AddressBuilder l3ab = new L3AddressBuilder();
             l3ab.setIpAddress(i);
             l3ab.setL3Context(l3Context);
@@ -295,13 +295,10 @@ public class Identity {
         final int prime = 31;
         int result = 1;
         result = prime * result + ((ips == null) ? 0 : ips.hashCode());
-        result = prime * result
-                + ((l2Context == null) ? 0 : l2Context.hashCode());
-        result = prime * result
-                + ((l3Context == null) ? 0 : l3Context.hashCode());
+        result = prime * result + ((l2Context == null) ? 0 : l2Context.hashCode());
+        result = prime * result + ((l3Context == null) ? 0 : l3Context.hashCode());
         result = prime * result + ((mac == null) ? 0 : mac.hashCode());
-        result = prime * result
-                + ((primaryIp == null) ? 0 : primaryIp.hashCode());
+        result = prime * result + ((primaryIp == null) ? 0 : primaryIp.hashCode());
         result = prime * result + ((type == null) ? 0 : type.hashCode());
         return result;
     }
index 3e3cb58f1ed46a8c05b80ff0e5b1dd5c7e106bcc..8111105d4d57ff0a85ee3d3f2f176dbd8654adba 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
+ * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -32,17 +32,15 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 
-
 /**
  * A context for mapping OpFlex messaging to asynchronous
  * requests to the Endpoint Registry's list of L2 Endpoints.
  *
  * @author tbachman
- *
  */
-public class L2EprOperation implements EprOperation, FutureCallback<Optional<Endpoint>>{
+public class L2EprOperation implements EprOperation, FutureCallback<Optional<Endpoint>> {
 
-       private EprOpCallback cb;
+    private EprOpCallback cb;
     private Endpoint ep;
     private InstanceIdentifier<Endpoint> iid;
 
@@ -54,41 +52,39 @@ public class L2EprOperation implements EprOperation, FutureCallback<Optional<End
     private List<L3Address> l3al;
     private Long timeout;
 
-
     public L2EprOperation(int prr) {
         this.timeout = Long.valueOf(prr);
         this.l3al = new ArrayList<L3Address>();
     }
 
-    public L2EprOperation() {
-    }
+    public L2EprOperation() {}
 
     public void setAgentId(String agentId) {
         this.agentId = agentId;
     }
 
     public void setTenantId(TenantId tid) {
-       this.tid = tid;
+        this.tid = tid;
     }
 
     public void setEndpointGroupId(EndpointGroupId egid) {
-       this.egid = egid;
+        this.egid = egid;
     }
 
     public void setContextId(L2BridgeDomainId l2bdid) {
-       this.l2bdid = l2bdid;
+        this.l2bdid = l2bdid;
     }
 
     public void setMacAddress(MacAddress mac) {
-       this.mac = mac;
+        this.mac = mac;
     }
 
     public void setL3AddressList(List<L3Address> l3al) {
-       this.l3al = l3al;
+        this.l3al = l3al;
     }
 
     public void addL3Address(L3Address l3a) {
-       this.l3al.add(l3a);
+        this.l3al.add(l3a);
     }
 
     public Endpoint getEp() {
@@ -105,15 +101,15 @@ public class L2EprOperation implements EprOperation, FutureCallback<Optional<End
         oocb.setAgentId(this.agentId);
 
         epBuilder.setTenant(this.tid)
-                 .setEndpointGroup(this.egid)
-                 .setL2Context(this.l2bdid)
-                 .setL3Address(l3al)
-                 .setMacAddress(this.mac)
-                 .setTimestamp(this.timeout)
-                 .addAugmentation(OpflexOverlayContext.class, oocb.build());
+            .setEndpointGroup(this.egid)
+            .setL2Context(this.l2bdid)
+            .setL3Address(l3al)
+            .setMacAddress(this.mac)
+            .setTimestamp(this.timeout)
+            .addAugmentation(OpflexOverlayContext.class, oocb.build());
 
         // TODO: add support for conditions
-        //epBuilder.setCondition(new List<ConditionName>());
+        // epBuilder.setCondition(new List<ConditionName>());
 
         return epBuilder.build();
     }
@@ -127,9 +123,7 @@ public class L2EprOperation implements EprOperation, FutureCallback<Optional<End
     public void put(WriteTransaction wt) {
 
         ep = buildEp();
-        this.iid = InstanceIdentifier.builder(Endpoints.class)
-               .child(Endpoint.class, ep.getKey())
-               .build();
+        this.iid = InstanceIdentifier.builder(Endpoints.class).child(Endpoint.class, ep.getKey()).build();
         wt.put(LogicalDatastoreType.OPERATIONAL, iid, ep);
     }
 
@@ -137,9 +131,7 @@ public class L2EprOperation implements EprOperation, FutureCallback<Optional<End
     public void delete(WriteTransaction wt) {
 
         ep = buildEp();
-        this.iid = InstanceIdentifier.builder(Endpoints.class)
-               .child(Endpoint.class, ep.getKey())
-               .build();
+        this.iid = InstanceIdentifier.builder(Endpoints.class).child(Endpoint.class, ep.getKey()).build();
         wt.delete(LogicalDatastoreType.OPERATIONAL, iid);
     }
 
@@ -147,28 +139,24 @@ public class L2EprOperation implements EprOperation, FutureCallback<Optional<End
      * Get/read an L2 endpoint in the registry, given a context
      * and an identifier.
      * .
+     * 
      * @param rot The read transaction
      */
     @Override
-    public void read(ReadOnlyTransaction rot,
-               ScheduledExecutorService executor) {
+    public void read(ReadOnlyTransaction rot, ScheduledExecutorService executor) {
 
-       ep = buildEp();
-       this.iid = InstanceIdentifier.builder(Endpoints.class)
-               .child(Endpoint.class, ep.getKey())
-               .build();
+        ep = buildEp();
+        this.iid = InstanceIdentifier.builder(Endpoints.class).child(Endpoint.class, ep.getKey()).build();
 
-       ListenableFuture<Optional<Endpoint>> dao =
-                rot.read(LogicalDatastoreType.OPERATIONAL, iid);
+        ListenableFuture<Optional<Endpoint>> dao = rot.read(LogicalDatastoreType.OPERATIONAL, iid);
         Futures.addCallback(dao, this, executor);
     }
 
     @Override
     public void setCallback(EprOpCallback callback) {
-       this.cb = callback;
+        this.cb = callback;
     }
 
-
     @Override
     public void onSuccess(final Optional<Endpoint> result) {
         if (!result.isPresent()) {
@@ -186,7 +174,6 @@ public class L2EprOperation implements EprOperation, FutureCallback<Optional<End
         cb.callback(this);
     }
 
-
     @Override
     public void onFailure(Throwable t) {
         cb.callback(this);
index 110b6cd7957c42eaf0625affb7c7e08199fd0743..0ef683e536efe34be2d8462d7203862c45c9fdcf 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
+ * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -33,17 +33,15 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 
-
 /**
  * A context for mapping OpFlex messaging to asynchronous
  * requests to the Endpoint Registry's list of L3 Endpoints.
  *
  * @author tbachman
- *
  */
-public class L3EprOperation implements EprOperation, FutureCallback<Optional<EndpointL3>>{
+public class L3EprOperation implements EprOperation, FutureCallback<Optional<EndpointL3>> {
 
-       private EprOpCallback cb;
+    private EprOpCallback cb;
     private EndpointL3 ep;
     private InstanceIdentifier<EndpointL3> iid;
 
@@ -61,47 +59,48 @@ public class L3EprOperation implements EprOperation, FutureCallback<Optional<End
         this.timeout = Long.valueOf(prr);
     }
 
-    public L3EprOperation() {
-    }
+    public L3EprOperation() {}
 
     public void setAgentId(String agentId) {
         this.agentId = agentId;
     }
 
     public void setTenantId(TenantId tid) {
-       this.tid = tid;
+        this.tid = tid;
     }
 
     public void setEndpointGroupId(EndpointGroupId egid) {
-       this.egid = egid;
+        this.egid = egid;
     }
 
     public void setContextId(L3ContextId l3cid) {
-       this.l3cid = l3cid;
+        this.l3cid = l3cid;
     }
 
     public void setL2BridgDomainId(L2BridgeDomainId l2bdid) {
-       this.l2bdid = l2bdid;
+        this.l2bdid = l2bdid;
     }
 
     public void setMacAddress(MacAddress mac) {
-       this.mac = mac;
+        this.mac = mac;
     }
 
     public void setIpAddress(IpAddress ip) {
-       this.ip = ip;
+        this.ip = ip;
     }
 
     public void setL3AddressList(List<L3Address> l3al) {
-       this.l3al = l3al;
+        this.l3al = l3al;
     }
 
     public void addL3Address(L3Address l3a) {
-       this.l3al.add(l3a);
+        this.l3al.add(l3a);
     }
+
     public EndpointL3 getEp() {
         return ep;
     }
+
     public void setEp(EndpointL3 ep) {
         this.ep = ep;
     }
@@ -112,18 +111,17 @@ public class L3EprOperation implements EprOperation, FutureCallback<Optional<End
         oocb.setAgentId(this.agentId);
 
         epBuilder.setTenant(this.tid)
-                 .setEndpointGroup(this.egid)
-                 .setL2Context(this.l2bdid)
-                 .setL3Context(this.l3cid)
-                 .setL3Address(l3al)
-                 .setMacAddress(this.mac)
-                 .setIpAddress(this.ip)
-                 .setTimestamp(this.timeout)
-                 .addAugmentation(OpflexOverlayContextL3.class, oocb.build());
-
+            .setEndpointGroup(this.egid)
+            .setL2Context(this.l2bdid)
+            .setL3Context(this.l3cid)
+            .setL3Address(l3al)
+            .setMacAddress(this.mac)
+            .setIpAddress(this.ip)
+            .setTimestamp(this.timeout)
+            .addAugmentation(OpflexOverlayContextL3.class, oocb.build());
 
         // TODO: add support for conditions
-        //epBuilder.setCondition(new List<ConditionName>());
+        // epBuilder.setCondition(new List<ConditionName>());
 
         return epBuilder.build();
     }
@@ -145,45 +143,38 @@ public class L3EprOperation implements EprOperation, FutureCallback<Optional<End
         cb.callback(this);
     }
 
-
     @Override
     public void onFailure(Throwable t) {
         // TODO: implement another callback
     }
 
-       @Override
-       public void put(WriteTransaction wt) {
+    @Override
+    public void put(WriteTransaction wt) {
         ep = buildEp();
-        this.iid = InstanceIdentifier.builder(Endpoints.class)
-               .child(EndpointL3.class, ep.getKey())
-               .build();
+        this.iid = InstanceIdentifier.builder(Endpoints.class).child(EndpointL3.class, ep.getKey()).build();
         wt.put(LogicalDatastoreType.OPERATIONAL, iid, ep);
-       }
+    }
 
-       @Override
-       public void delete(WriteTransaction wt) {
+    @Override
+    public void delete(WriteTransaction wt) {
         ep = buildEp();
-        this.iid = InstanceIdentifier.builder(Endpoints.class)
-               .child(EndpointL3.class, ep.getKey())
-               .build();
+        this.iid = InstanceIdentifier.builder(Endpoints.class).child(EndpointL3.class, ep.getKey()).build();
         wt.delete(LogicalDatastoreType.OPERATIONAL, iid);
-       }
+    }
 
-       @Override
-       public void read(ReadOnlyTransaction rot, ScheduledExecutorService executor) {
+    @Override
+    public void read(ReadOnlyTransaction rot, ScheduledExecutorService executor) {
         ep = buildEp();
-       this.iid = InstanceIdentifier.builder(Endpoints.class)
-               .child(EndpointL3.class, ep.getKey())
-               .build();
+        this.iid = InstanceIdentifier.builder(Endpoints.class).child(EndpointL3.class, ep.getKey()).build();
 
-       ListenableFuture<Optional<EndpointL3>> dao =
-                rot.read(LogicalDatastoreType.OPERATIONAL, iid);
+        ListenableFuture<Optional<EndpointL3>> dao = rot.read(LogicalDatastoreType.OPERATIONAL, iid);
         Futures.addCallback(dao, this, executor);
 
-       }
-       @Override
-       public void setCallback(EprOpCallback callback) {
-               this.cb = callback;
-       }
+    }
+
+    @Override
+    public void setCallback(EprOpCallback callback) {
+        this.cb = callback;
+    }
 
 }
index 1c8a75a2a1f1a8214f78b7c87e09e4d7d5fbb49c..61f81c0227d8900e4e43cba20b9b3cff046ff513 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : tbachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex;
@@ -68,12 +68,12 @@ import org.slf4j.LoggerFactory;
 import com.google.common.collect.Sets;
 
 public class MessageUtils {
-    private static final Logger LOG = LoggerFactory
-            .getLogger(MessageUtils.class);
+
+    private static final Logger LOG = LoggerFactory.getLogger(MessageUtils.class);
     /*
      * Endpoint Groups in ODL's Group Based Policy are specified in the
      * following format:
-     *
+     * 
      * /tenants/tenant/<tenant UUID>/endpoint-group/<endpoint-group UUID>
      */
     public static final String POLICY_ROOT = "";
@@ -100,8 +100,7 @@ public class MessageUtils {
     public static final String GENIE_ENDPOINT_L3_RN = "EprL3Ep";
 
     public static final String GENIE_TENANTS_RN = "PolicyUniverse";
-    public static final String GENIE_POLICY_ROOT = PolicyUri.POLICY_URI_SEP
-            + GENIE_TENANTS_RN;
+    public static final String GENIE_POLICY_ROOT = PolicyUri.POLICY_URI_SEP + GENIE_TENANTS_RN;
     public static final String GENIE_TENANT_RN = "PolicySpace";
     public static final String GENIE_CONTRACT_RN = "GbpContract";
     public static final String GENIE_SUBJECT_RN = "GbpSubject";
@@ -137,11 +136,9 @@ public class MessageUtils {
     public static final String GENIE_EPG_TO_NETWORK_DOMAIN_RN = "GbpEpGroupToNetworkRSrc";
     public static final String GENIE_SUBNET_TO_NETWORK_SRC_REF = "GbpSubnetsToNetworkRSrc";
 
-    public static final String TENANT_PREFIX = POLICY_ROOT
-            + PolicyUri.POLICY_URI_SEP + TENANTS_RN + PolicyUri.POLICY_URI_SEP
-            + TENANT_RN + PolicyUri.POLICY_URI_SEP;
-    public static final String GENIE_TENANT_PREFIX = GENIE_POLICY_ROOT
-            + PolicyUri.POLICY_URI_SEP + GENIE_TENANT_RN
+    public static final String TENANT_PREFIX = POLICY_ROOT + PolicyUri.POLICY_URI_SEP + TENANTS_RN
+            + PolicyUri.POLICY_URI_SEP + TENANT_RN + PolicyUri.POLICY_URI_SEP;
+    public static final String GENIE_TENANT_PREFIX = GENIE_POLICY_ROOT + PolicyUri.POLICY_URI_SEP + GENIE_TENANT_RN
             + PolicyUri.POLICY_URI_SEP;
 
     public static final String GENIE_CONTRACT_NAME = "name";
@@ -229,10 +226,8 @@ public class MessageUtils {
 
         odlToGenieMap = new ConcurrentHashMap<String, String>();
         odlToGenieMap.put(ENDPOINTS_RN, "");
-        odlToGenieMap.put(ENDPOINT_RN, GENIE_EPR_L2_ROOT
-                + PolicyUri.POLICY_URI_SEP + GENIE_ENDPOINT_RN);
-        odlToGenieMap.put(ENDPOINT_L3_RN, GENIE_EPR_L3_ROOT
-                + PolicyUri.POLICY_URI_SEP + GENIE_ENDPOINT_L3_RN);
+        odlToGenieMap.put(ENDPOINT_RN, GENIE_EPR_L2_ROOT + PolicyUri.POLICY_URI_SEP + GENIE_ENDPOINT_RN);
+        odlToGenieMap.put(ENDPOINT_L3_RN, GENIE_EPR_L3_ROOT + PolicyUri.POLICY_URI_SEP + GENIE_ENDPOINT_L3_RN);
         odlToGenieMap.put(TENANTS_RN, GENIE_TENANTS_RN);
         odlToGenieMap.put(TENANT_RN, GENIE_TENANT_RN);
         odlToGenieMap.put(EPG_RN, GENIE_EPG_RN);
@@ -243,8 +238,7 @@ public class MessageUtils {
         odlToGenieMap.put(CLASSIFIER_REF_RN, GENIE_CLASSIFIER_RN);
         odlToGenieMap.put(L2_FLOOD_DOMAIN_RN, GENIE_FLOOD_DOMAIN_RN);
         odlToGenieMap.put(L2_BRIDGE_DOMAIN_RN, GENIE_BRIDGE_DOMAIN_RN);
-        odlToGenieMap.put(SUBNET_RN, GENIE_SUBNETS_RN
-                + PolicyUri.POLICY_URI_SEP + GENIE_SUBNET_NAME_DEFAULT
+        odlToGenieMap.put(SUBNET_RN, GENIE_SUBNETS_RN + PolicyUri.POLICY_URI_SEP + GENIE_SUBNET_NAME_DEFAULT
                 + PolicyUri.POLICY_URI_SEP + GENIE_SUBNET_RN);
         odlToGenieMap.put(L3_CONTEXT_RN, GENIE_ROUTING_DOMAIN_RN);
 
@@ -286,7 +280,7 @@ public class MessageUtils {
     /*
      * Until I clean this up, this is going to accept the Genie URI. The format
      * for these URIs is:
-     *
+     * 
      * /PolicyUniverse/PolicySpace/[name]
      */
     public static String getTenantFromUri(String uri) {
@@ -299,9 +293,9 @@ public class MessageUtils {
     /*
      * Until I clean this up, this is going to be the Genie URI. The format for
      * these URIs is:
-     *
+     * 
      * /PolicyUniverse/PolicySpace/[name]/GbpEpGroup/[name]
-     *
+     * 
      * Where [name] is the tenant and ID for the EPG
      */
     public static String getEndpointGroupFromUri(String uri) {
@@ -340,8 +334,8 @@ public class MessageUtils {
     }
 
     public static String createEpgUri(String tenantId, String epgId) {
-        return GENIE_TENANT_PREFIX + tenantId + PolicyUri.POLICY_URI_SEP
-                + GENIE_EPG_RN + PolicyUri.POLICY_URI_SEP + epgId;
+        return GENIE_TENANT_PREFIX + tenantId + PolicyUri.POLICY_URI_SEP + GENIE_EPG_RN + PolicyUri.POLICY_URI_SEP
+                + epgId;
     }
 
     public static boolean hasEpg(String uri) {
@@ -369,8 +363,7 @@ public class MessageUtils {
      */
     public static boolean isGenieUri(Uri uri) {
         PolicyUri puri = new PolicyUri(uri.toString());
-        List<String> genieRoot = Arrays.asList("PolicyUniverse",
-                "EprL2Universe", "EprL3Universe");
+        List<String> genieRoot = Arrays.asList("PolicyUniverse", "EprL2Universe", "EprL3Universe");
 
         if (genieRoot.contains(puri.getElement(0)))
             return true;
@@ -400,9 +393,9 @@ public class MessageUtils {
      * values needed for URI translation.
      *
      * @author tbachman
-     *
      */
     public static class UriIterator implements Iterator<String> {
+
         private PolicyUri uri;
         private int index;
         private int keyCount;
@@ -465,9 +458,7 @@ public class MessageUtils {
     /**
      * Convert ODL URI to a Genie URI. The ODL names are unique, so we are able
      * to provide a conversion based solely on name.
-     *
      * This only maps URIs from the following roots:
-     *
      * /endpoint /policy
      *
      * @param odlUri
@@ -489,15 +480,15 @@ public class MessageUtils {
 
             /*
              * Get the converted element, then make the following checks:
-             *
+             * 
              * o element is key - push the element directly onto the stack
-             *   without translation
+             * without translation
              * o no corresponding genie element - return --
-             *   we're done
+             * we're done
              * o genie element, but result is null - don't push
-             *   anything on the stack; continue
+             * anything on the stack; continue
              * o regular element - convert the
-             *   element and push it on the stack
+             * element and push it on the stack
              */
             String element = it.getElement();
             String genieElement = odlToGenieMap.get(element);
@@ -536,15 +527,15 @@ public class MessageUtils {
 
             /*
              * Get the converted element, then make the following checks:
-             *
+             * 
              * o element is key - push the element directly onto the stack
-             *   without translation
+             * without translation
              * o no corresponding genie element - return --
-             *   we're done
+             * we're done
              * o genie element, but result is null - don't push
-             *   anything on the stack; continue
+             * anything on the stack; continue
              * o regular element - convert the
-             *   element and push it on the stack
+             * element and push it on the stack
              */
             String element = it.getElement();
             String odlElement = genieToOdlMap.get(element);
@@ -568,8 +559,8 @@ public class MessageUtils {
 
     }
 
-    private static void setParentFields(PolicyUri current,
-            PolicyObjectInstance poi, String parentRelation, boolean hasId) {
+    private static void setParentFields(PolicyUri current, PolicyObjectInstance poi, String parentRelation,
+            boolean hasId) {
         PolicyUri uriCopy = new PolicyUri(current);
 
         // Pop off the subject name and class to get to parent
@@ -587,8 +578,7 @@ public class MessageUtils {
         poi.setParentRelation(parentRelation);
     }
 
-    public static List<ManagedObject> getSubjectMo(PolicyUri current,
-            Subject s, RuleGroup rg, IndexedTenant it) {
+    public static List<ManagedObject> getSubjectMo(PolicyUri current, Subject s, RuleGroup rg, IndexedTenant it) {
         if (s == null)
             return null;
 
@@ -616,11 +606,9 @@ public class MessageUtils {
             return null;
 
         for (PolicyPropertyInfo ppi : ppil) {
-            if (ppi.getPropName().equals(GENIE_SUBJECT_NAME)
-                    && s.getName() != null) {
+            if (ppi.getPropName().equals(GENIE_SUBJECT_NAME) && s.getName() != null) {
                 poi.setString(ppi.getPropId(), s.getName().getValue());
-            } else if (ppi.getPropName().equals(GENIE_RULE_RN)
-                    && s.getRule() != null) {
+            } else if (ppi.getPropName().equals(GENIE_RULE_RN) && s.getRule() != null) {
                 /*
                  * Each subject has a set of resolved rules. Add those as
                  * children.
@@ -651,8 +639,7 @@ public class MessageUtils {
         return mol;
     }
 
-    public static List<ManagedObject> getRuleMo(PolicyUri current, Rule r,
-            RuleGroup rg, IndexedTenant it) {
+    public static List<ManagedObject> getRuleMo(PolicyUri current, Rule r, RuleGroup rg, IndexedTenant it) {
         if (r == null)
             return null;
 
@@ -680,23 +667,18 @@ public class MessageUtils {
             return null;
 
         for (PolicyPropertyInfo ppi : ppil) {
-            if (ppi.getPropName().equals(GENIE_RULE_NAME)
-                    && r.getName() != null) {
+            if (ppi.getPropName().equals(GENIE_RULE_NAME) && r.getName() != null) {
                 poi.setString(ppi.getPropId(), r.getName().getValue());
-            } else if (ppi.getPropName().equals(GENIE_RULE_ORDER)
-                    && r.getOrder() != null) {
-                poi.setUint64(ppi.getPropId(), intToBigInt(r.getOrder()
-                        .intValue()));
-            } else if (ppi.getPropName().equals(GENIE_CLASSIFIER_REF_RN)
-                    && r.getClassifierRef() != null) {
+            } else if (ppi.getPropName().equals(GENIE_RULE_ORDER) && r.getOrder() != null) {
+                poi.setUint64(ppi.getPropId(), intToBigInt(r.getOrder().intValue()));
+            } else if (ppi.getPropName().equals(GENIE_CLASSIFIER_REF_RN) && r.getClassifierRef() != null) {
                 for (ClassifierRef cr : r.getClassifierRef()) {
                     ClassifierInstance ci = it.getClassifier(cr.getName());
                     if (ci != null) {
                         PolicyUri uri = new PolicyUri(prefix);
                         uri.push(GENIE_CLASSIFIER_REF_RN);
                         uri.push(cr.getName().getValue());
-                        mol.addAll(MessageUtils.getClassifierRefMo(uri, ci, cr,
-                                rg, it));
+                        mol.addAll(MessageUtils.getClassifierRefMo(uri, ci, cr, rg, it));
                         childrenUris.add(uri.getUri());
                         poi.addChild(uri.getUri()); // TODO: remove?
                     }
@@ -725,8 +707,7 @@ public class MessageUtils {
      * @param c
      * @return
      */
-    public static List<ManagedObject> getContractAndSubMos(
-            List<ManagedObject> cmol, PolicyUri current, Contract c,
+    public static List<ManagedObject> getContractAndSubMos(List<ManagedObject> cmol, PolicyUri current, Contract c,
             RuleGroup rg, IndexedTenant it) {
         if (c == null)
             return null;
@@ -756,11 +737,9 @@ public class MessageUtils {
         if (c.getSubject() == null)
             LOG.warn("subject is NULL");
         for (PolicyPropertyInfo ppi : ppil) {
-            if (ppi.getPropName().equals(GENIE_CONTRACT_NAME)
-                    && c.getId() != null) {
+            if (ppi.getPropName().equals(GENIE_CONTRACT_NAME) && c.getId() != null) {
                 poi.setString(ppi.getPropId(), c.getId().getValue());
-            } else if (ppi.getPropName().equals(GENIE_SUBJECT_RN)
-                    && c.getSubject() != null) {
+            } else if (ppi.getPropName().equals(GENIE_SUBJECT_RN) && c.getSubject() != null) {
 
                 LOG.warn("related subject is {}", rg.getRelatedSubject());
                 /*
@@ -804,8 +783,7 @@ public class MessageUtils {
         return mol;
     }
 
-    public static ManagedObject getConsumerNamedSelectorMo(PolicyUri current,
-            Contract c) {
+    public static ManagedObject getConsumerNamedSelectorMo(PolicyUri current, Contract c) {
         if (c == null)
             return null;
 
@@ -836,8 +814,7 @@ public class MessageUtils {
                 uri.push(GENIE_CONSUMER_CONTRACT_REF_RN);
                 uri.push(c.getId().getValue());
                 String newUri = odlUriToGenieUri(uri).toString();
-                PolicyReference pr = new PolicyReference(pci.getClassId(),
-                        new Uri(newUri));
+                PolicyReference pr = new PolicyReference(pci.getClassId(), new Uri(newUri));
                 poi.setReference(ppi.getPropId(), pr);
             }
         }
@@ -853,8 +830,7 @@ public class MessageUtils {
         return mo;
     }
 
-    public static ManagedObject getProviderNamedSelectorMo(PolicyUri current,
-            Contract c) {
+    public static ManagedObject getProviderNamedSelectorMo(PolicyUri current, Contract c) {
         if (c == null)
             return null;
         ManagedObject mo = new ManagedObject();
@@ -884,8 +860,7 @@ public class MessageUtils {
                 uri.push(GENIE_CONTRACT_RN);
                 uri.push(c.getId().getValue());
                 String newUri = odlUriToGenieUri(uri).toString();
-                PolicyReference pr = new PolicyReference(pci.getClassId(),
-                        new Uri(newUri));
+                PolicyReference pr = new PolicyReference(pci.getClassId(), new Uri(newUri));
                 // TODO: should we chase the contracts?
                 poi.setReference(ppi.getPropId(), pr);
             }
@@ -903,8 +878,7 @@ public class MessageUtils {
 
     }
 
-    private static List<BigInteger> getParamList(
-            HashMap<String, List<BigInteger>> hm, String type) {
+    private static List<BigInteger> getParamList(HashMap<String, List<BigInteger>> hm, String type) {
         List<BigInteger> pvl = null;
         pvl = hm.get(type);
         if (pvl == null) {
@@ -925,8 +899,7 @@ public class MessageUtils {
      * @param cr
      * @return
      */
-    private static HashMap<String, List<BigInteger>> buildParameterValues(
-            ClassifierInstance ci, ClassifierRef cr) {
+    private static HashMap<String, List<BigInteger>> buildParameterValues(ClassifierInstance ci, ClassifierRef cr) {
         HashMap<String, List<BigInteger>> pmap = new HashMap<String, List<BigInteger>>();
         List<BigInteger> pvl = null;
 
@@ -942,20 +915,20 @@ public class MessageUtils {
             if (pv.getName().getValue().equals("type")) {
                 if (pv.getIntValue() != null) {
                     switch (pv.getIntValue().intValue()) {
-                    case 0x0806:
-                    case 0x8906:
-                    case 0x0800:
-                    case 0x86DD:
-                    case 0x88E5:
-                    case 0x8847:
-                    case 0x22F3:
-
-                        pvl = getParamList(pmap, GENIE_CLASSIFIER_ETHERT);
-                        pvl.add(intToBigInt(pv.getIntValue().intValue()));
-                        break;
-
-                    default:
-                        break;
+                        case 0x0806:
+                        case 0x8906:
+                        case 0x0800:
+                        case 0x86DD:
+                        case 0x88E5:
+                        case 0x8847:
+                        case 0x22F3:
+
+                            pvl = getParamList(pmap, GENIE_CLASSIFIER_ETHERT);
+                            pvl.add(intToBigInt(pv.getIntValue().intValue()));
+                            break;
+
+                        default:
+                            break;
                     }
                 } else if (pv.getStringValue() != null) {
                     if (pv.getStringValue().equals("TCP")) {
@@ -1007,9 +980,8 @@ public class MessageUtils {
 
     }
 
-    public static List<ManagedObject> getClassifierRefMo(PolicyUri current,
-            ClassifierInstance ci, ClassifierRef cr, RuleGroup rg,
-            IndexedTenant it) {
+    public static List<ManagedObject> getClassifierRefMo(PolicyUri current, ClassifierInstance ci, ClassifierRef cr,
+            RuleGroup rg, IndexedTenant it) {
 
         List<ManagedObject> mol = new ArrayList<ManagedObject>();
         ManagedObject mo = new ManagedObject();
@@ -1038,14 +1010,12 @@ public class MessageUtils {
                 uri.push(rg.getContractTenant().getId().getValue());
                 uri.push(GENIE_CLASSIFIER_RN);
                 uri.push(ci.getName().getValue());
-                ManagedObject clMo = getClassifierInstanceMo(uri, ci, cr, rg,
-                        it);
+                ManagedObject clMo = getClassifierInstanceMo(uri, ci, cr, rg, it);
                 if (clMo != null) {
                     mol.add(clMo);
                 }
 
-                PolicyReference pr = new PolicyReference(pci.getClassId(),
-                        uri.getUri());
+                PolicyReference pr = new PolicyReference(pci.getClassId(), uri.getUri());
                 poi.setReference(ppi.getPropId(), pr);
             }
         }
@@ -1073,9 +1043,8 @@ public class MessageUtils {
      * @param it
      * @return
      */
-    public static ManagedObject getClassifierInstanceMo(PolicyUri current,
-            ClassifierInstance ci, ClassifierRef cr, RuleGroup rg,
-            IndexedTenant it) {
+    public static ManagedObject getClassifierInstanceMo(PolicyUri current, ClassifierInstance ci, ClassifierRef cr,
+            RuleGroup rg, IndexedTenant it) {
         if (ci == null)
             return null;
 
@@ -1106,18 +1075,14 @@ public class MessageUtils {
         String prefix = convertedUri.toString();
 
         for (PolicyPropertyInfo ppi : ppil) {
-            if (ppi.getPropName().equals(GENIE_CLASSIFIER_NAME)
-                    && cr.getName() != null) {
+            if (ppi.getPropName().equals(GENIE_CLASSIFIER_NAME) && cr.getName() != null) {
                 poi.setString(ppi.getPropId(), cr.getName().getValue());
-                Uri child = new Uri(prefix + GENIE_CLASSIFIER_NAME
-                        + cr.getName().getValue());
+                Uri child = new Uri(prefix + GENIE_CLASSIFIER_NAME + cr.getName().getValue());
                 poi.setUri(child);
-            } else if (ppi.getPropName().equals(GENIE_CLASSIFIER_DIRECTION)
-                    && cr.getDirection() != null) {
+            } else if (ppi.getPropName().equals(GENIE_CLASSIFIER_DIRECTION) && cr.getDirection() != null) {
                 // initialize with bogus values for placeholders, then replace
                 // with real ones
-                List<Integer> odl2genie = new ArrayList<Integer>(Arrays.asList(
-                        1, 2, 3));
+                List<Integer> odl2genie = new ArrayList<Integer>(Arrays.asList(1, 2, 3));
                 odl2genie.set(0, 1);
                 odl2genie.set(1, 2);
                 odl2genie.set(2, 0);
@@ -1129,43 +1094,29 @@ public class MessageUtils {
                  * Value: | ODL | Genie --------------+-----+--------
                  * bidirectional | 2 | 0 in | 0 | 1 out | 1 | 2
                  */
-                Integer genieDirection = odl2genie.get(cr.getDirection()
-                        .getIntValue());
-                poi.setUint64(ppi.getPropId(),
-                        new BigInteger(genieDirection.toString()));
-            } else if (ppi.getPropName().equals(
-                    GENIE_CLASSIFIER_CONNECTION_TRACKING)
+                Integer genieDirection = odl2genie.get(cr.getDirection().getIntValue());
+                poi.setUint64(ppi.getPropId(), new BigInteger(genieDirection.toString()));
+            } else if (ppi.getPropName().equals(GENIE_CLASSIFIER_CONNECTION_TRACKING)
                     && cr.getConnectionTracking() != null) {
-                poi.setUint64(ppi.getPropId(), intToBigInt(cr
-                        .getConnectionTracking().getIntValue()));
-            } else if (ppi.getPropName().equals(GENIE_CLASSIFIER_ARP_OPC)
-                    && pmap.get(GENIE_CLASSIFIER_ARP_OPC) != null) {
-                poi.setUint64(ppi.getPropId(),
-                        pmap.get(GENIE_CLASSIFIER_ARP_OPC).get(0));
-            } else if (ppi.getPropName().equals(GENIE_CLASSIFIER_ETHERT)
-                    && pmap.get(GENIE_CLASSIFIER_ETHERT) != null) {
-                poi.setUint64(ppi.getPropId(), pmap
-                        .get(GENIE_CLASSIFIER_ETHERT).get(0));
+                poi.setUint64(ppi.getPropId(), intToBigInt(cr.getConnectionTracking().getIntValue()));
+            } else if (ppi.getPropName().equals(GENIE_CLASSIFIER_ARP_OPC) && pmap.get(GENIE_CLASSIFIER_ARP_OPC) != null) {
+                poi.setUint64(ppi.getPropId(), pmap.get(GENIE_CLASSIFIER_ARP_OPC).get(0));
+            } else if (ppi.getPropName().equals(GENIE_CLASSIFIER_ETHERT) && pmap.get(GENIE_CLASSIFIER_ETHERT) != null) {
+                poi.setUint64(ppi.getPropId(), pmap.get(GENIE_CLASSIFIER_ETHERT).get(0));
             } else if (ppi.getPropName().equals(GENIE_CLASSIFIER_DFROM_PORT)
                     && pmap.get(GENIE_CLASSIFIER_DFROM_PORT) != null) {
-                poi.setUint64(ppi.getPropId(),
-                        pmap.get(GENIE_CLASSIFIER_DFROM_PORT).get(0));
+                poi.setUint64(ppi.getPropId(), pmap.get(GENIE_CLASSIFIER_DFROM_PORT).get(0));
             } else if (ppi.getPropName().equals(GENIE_CLASSIFIER_DTO_PORT)
                     && pmap.get(GENIE_CLASSIFIER_DTO_PORT) != null) {
-                poi.setUint64(ppi.getPropId(),
-                        pmap.get(GENIE_CLASSIFIER_DTO_PORT).get(0));
+                poi.setUint64(ppi.getPropId(), pmap.get(GENIE_CLASSIFIER_DTO_PORT).get(0));
             } else if (ppi.getPropName().equals(GENIE_CLASSIFIER_SFROM_PORT)
                     && pmap.get(GENIE_CLASSIFIER_SFROM_PORT) != null) {
-                poi.setUint64(ppi.getPropId(),
-                        pmap.get(GENIE_CLASSIFIER_SFROM_PORT).get(0));
+                poi.setUint64(ppi.getPropId(), pmap.get(GENIE_CLASSIFIER_SFROM_PORT).get(0));
             } else if (ppi.getPropName().equals(GENIE_CLASSIFIER_STO_PORT)
                     && pmap.get(GENIE_CLASSIFIER_STO_PORT) != null) {
-                poi.setUint64(ppi.getPropId(),
-                        pmap.get(GENIE_CLASSIFIER_STO_PORT).get(0));
-            } else if (ppi.getPropName().equals(GENIE_CLASSIFIER_PROT)
-                    && pmap.get(GENIE_CLASSIFIER_PROT) != null) {
-                poi.setUint64(ppi.getPropId(), pmap.get(GENIE_CLASSIFIER_PROT)
-                        .get(0));
+                poi.setUint64(ppi.getPropId(), pmap.get(GENIE_CLASSIFIER_STO_PORT).get(0));
+            } else if (ppi.getPropName().equals(GENIE_CLASSIFIER_PROT) && pmap.get(GENIE_CLASSIFIER_PROT) != null) {
+                poi.setUint64(ppi.getPropId(), pmap.get(GENIE_CLASSIFIER_PROT).get(0));
             }
         }
 
@@ -1181,6 +1132,7 @@ public class MessageUtils {
     }
 
     public static class Ipv4PlusSubnet {
+
         private String prefix;
         private String mask;
 
@@ -1199,8 +1151,7 @@ public class MessageUtils {
             int msk = -1 << (32 - Integer.parseInt(parts[1]));
             int sub = ip & msk;
             for (int i = 0; i < 3; i++) {
-                this.prefix = this.prefix
-                        + String.valueOf((sub >> (24 - 8 * i)) & 0xff) + ".";
+                this.prefix = this.prefix + String.valueOf((sub >> (24 - 8 * i)) & 0xff) + ".";
             }
             this.prefix = this.prefix + String.valueOf(sub & 0xff);
         }
@@ -1223,8 +1174,7 @@ public class MessageUtils {
 
     }
 
-    public static ManagedObject getSubnetMo(PolicyUri current, Subnet s,
-            Tenant t) {
+    public static ManagedObject getSubnetMo(PolicyUri current, Subnet s, Tenant t) {
 
         /*
          * Build up the equivalent Genie object
@@ -1245,31 +1195,25 @@ public class MessageUtils {
             return null;
 
         // convert this once - we'll use it below
-        Ipv4PlusSubnet ipv4 = new Ipv4PlusSubnet(s.getIpPrefix()
-                .getIpv4Prefix().getValue());
+        Ipv4PlusSubnet ipv4 = new Ipv4PlusSubnet(s.getIpPrefix().getIpv4Prefix().getValue());
 
         for (PolicyPropertyInfo ppi : ppil) {
 
             // use the subnet ID for the subnets (plural) ID
-            if (ppi.getPropName().equals(GENIE_SUBNET_NAME)
-                    && s.getId() != null) {
+            if (ppi.getPropName().equals(GENIE_SUBNET_NAME) && s.getId() != null) {
                 poi.setString(ppi.getPropId(), GENIE_SUBNET_NAME_DEFAULT);
             }
-            if (ppi.getPropName().equals(GENIE_SUBNET_ADDRESS)
-                    && s.getIpPrefix() != null) {
+            if (ppi.getPropName().equals(GENIE_SUBNET_ADDRESS) && s.getIpPrefix() != null) {
                 /*
                  * We need to strip off the subnet delimiter
                  */
                 poi.setString(ppi.getPropId(), ipv4.getPrefixAsString());
             }
-            if (ppi.getPropName().equals(GENIE_SUBNET_PREFIX_LEN)
-                    && s.getIpPrefix() != null) {
+            if (ppi.getPropName().equals(GENIE_SUBNET_PREFIX_LEN) && s.getIpPrefix() != null) {
                 poi.setUint64(ppi.getPropId(), ipv4.getMaskAsBigInt());
             }
-            if (ppi.getPropName().equals(GENIE_SUBNET_VIRTUAL_ROUTER_IP)
-                    && s.getVirtualRouterIp() != null) {
-                poi.setString(ppi.getPropId(), s.getVirtualRouterIp()
-                        .getIpv4Address().getValue());
+            if (ppi.getPropName().equals(GENIE_SUBNET_VIRTUAL_ROUTER_IP) && s.getVirtualRouterIp() != null) {
+                poi.setString(ppi.getPropId(), s.getVirtualRouterIp().getIpv4Address().getValue());
             }
         }
 
@@ -1285,8 +1229,7 @@ public class MessageUtils {
         return mo;
     }
 
-    public static List<ManagedObject> getSubnetNetworkRefMo(PolicyUri current,
-            NetworkDomainId ndid, Tenant t) {
+    public static List<ManagedObject> getSubnetNetworkRefMo(PolicyUri current, NetworkDomainId ndid, Tenant t) {
         if (ndid == null)
             return null;
 
@@ -1310,8 +1253,7 @@ public class MessageUtils {
             return null;
 
         for (PolicyPropertyInfo ppi : ppil) {
-            if (ppi.getPropName()
-                    .equals(GENIE_SUBNETS_TO_NETWORK_DOMAIN_TARGET)) {
+            if (ppi.getPropName().equals(GENIE_SUBNETS_TO_NETWORK_DOMAIN_TARGET)) {
 
                 PolicyUri uri = new PolicyUri(convertedUri);
                 uri.pop();
@@ -1341,8 +1283,7 @@ public class MessageUtils {
                  * We default to this being a routing domain reference if the
                  * actual reference can't be resolved.
                  */
-                PolicyReference pr = new PolicyReference(pci.getClassId(),
-                        uri.getUri());
+                PolicyReference pr = new PolicyReference(pci.getClassId(), uri.getUri());
                 poi.setReference(ppi.getPropId(), pr);
             }
         }
@@ -1359,8 +1300,7 @@ public class MessageUtils {
         return mol;
     }
 
-    public static List<ManagedObject> getSubnetsMo(PolicyUri current,
-            NetworkDomainId nid, Tenant t) {
+    public static List<ManagedObject> getSubnetsMo(PolicyUri current, NetworkDomainId nid, Tenant t) {
         if (nid == null)
             return null;
         List<ManagedObject> mol = new ArrayList<ManagedObject>();
@@ -1402,12 +1342,10 @@ public class MessageUtils {
 
         for (PolicyPropertyInfo ppi : ppil) {
             // use the subnet ID for the subnets (plural) ID
-            if (ppi.getPropName().equals(GENIE_SUBNETS_NAME)
-                    && subnetMatch.getId() != null) {
+            if (ppi.getPropName().equals(GENIE_SUBNETS_NAME) && subnetMatch.getId() != null) {
                 poi.setString(ppi.getPropId(), subnetMatch.getId().getValue());
             }
-            if (ppi.getPropName().equals(GENIE_SUBNET_RN)
-                    && subnetMatch.getId() != null) {
+            if (ppi.getPropName().equals(GENIE_SUBNET_RN) && subnetMatch.getId() != null) {
                 PolicyUri child = new PolicyUri(prefix);
                 child.push(GENIE_SUBNET_RN);
                 child.push(GENIE_SUBNET_NAME_DEFAULT);
@@ -1417,8 +1355,7 @@ public class MessageUtils {
                 }
                 childrenUris.add(child.getUri());
             }
-            if (ppi.getPropName().equals(GENIE_SUBNETS_TO_NETWORK_RN)
-                    && subnetMatch.getParent() != null) {
+            if (ppi.getPropName().equals(GENIE_SUBNETS_TO_NETWORK_RN) && subnetMatch.getParent() != null) {
                 PolicyUri child = new PolicyUri(prefix);
                 child.push(GENIE_SUBNETS_TO_NETWORK_RN);
                 mol = getSubnetNetworkRefMo(child, subnetMatch.getParent(), t);
@@ -1441,8 +1378,7 @@ public class MessageUtils {
         return mol;
     }
 
-    public static List<ManagedObject> getL2FloodDomainRefMo(PolicyUri current,
-            NetworkDomainId ndid, Tenant t) {
+    public static List<ManagedObject> getL2FloodDomainRefMo(PolicyUri current, NetworkDomainId ndid, Tenant t) {
         if (ndid == null)
             return null;
         List<ManagedObject> mol = new ArrayList<ManagedObject>();
@@ -1458,8 +1394,7 @@ public class MessageUtils {
             return null;
 
         PolicyObjectInstance poi = new PolicyObjectInstance(pci.getClassId());
-        setParentFields(convertedUri, poi, GENIE_FLOOD_DOMAIN_TO_NETWORK_RN,
-                false);
+        setParentFields(convertedUri, poi, GENIE_FLOOD_DOMAIN_TO_NETWORK_RN, false);
         poi.setUri(convertedUri.getUri());
 
         List<PolicyPropertyInfo> ppil = pci.getProperties();
@@ -1499,8 +1434,7 @@ public class MessageUtils {
                  * We default to this being a routing domain reference if the
                  * actual reference can't be resolved.
                  */
-                PolicyReference pr = new PolicyReference(pci.getClassId(),
-                        uri.getUri());
+                PolicyReference pr = new PolicyReference(pci.getClassId(), uri.getUri());
                 poi.setReference(ppi.getPropId(), pr);
             }
         }
@@ -1517,8 +1451,7 @@ public class MessageUtils {
         return mol;
     }
 
-    public static List<ManagedObject> getL2FloodDomainMo(PolicyUri current,
-            NetworkDomainId ndid, Tenant t) {
+    public static List<ManagedObject> getL2FloodDomainMo(PolicyUri current, NetworkDomainId ndid, Tenant t) {
         if (ndid == null)
             return null;
 
@@ -1563,15 +1496,13 @@ public class MessageUtils {
             if (ppi.getPropName().equals(GENIE_FLOOD_DOMAIN_NAME)) {
                 poi.setString(ppi.getPropId(), l2fdMatch.getId().getValue());
             }
-            if (ppi.getPropName().equals(GENIE_FLOOD_DOMAIN_TO_NETWORK_RN)
-                    && l2fdMatch.getParent() != null) {
+            if (ppi.getPropName().equals(GENIE_FLOOD_DOMAIN_TO_NETWORK_RN) && l2fdMatch.getParent() != null) {
                 /*
                  * Add as a child, not a property, and get the child
                  */
                 PolicyUri child = new PolicyUri(prefix);
                 child.push(GENIE_FLOOD_DOMAIN_TO_NETWORK_RN);
-                mol.addAll(getL2FloodDomainRefMo(child, l2fdMatch.getParent(),
-                        t));
+                mol.addAll(getL2FloodDomainRefMo(child, l2fdMatch.getParent(), t));
                 childrenUris.add(child.getUri());
             }
         }
@@ -1590,8 +1521,7 @@ public class MessageUtils {
         return mol;
     }
 
-    public static List<ManagedObject> getL2BridgeDomainRefMo(PolicyUri current,
-            NetworkDomainId ndid, Tenant t) {
+    public static List<ManagedObject> getL2BridgeDomainRefMo(PolicyUri current, NetworkDomainId ndid, Tenant t) {
         if (ndid == null)
             return null;
 
@@ -1608,8 +1538,7 @@ public class MessageUtils {
             return null;
 
         PolicyObjectInstance poi = new PolicyObjectInstance(pci.getClassId());
-        setParentFields(convertedUri, poi, GENIE_BRIDGE_DOMAIN_TO_NETWORK_RN,
-                false);
+        setParentFields(convertedUri, poi, GENIE_BRIDGE_DOMAIN_TO_NETWORK_RN, false);
         poi.setUri(convertedUri.getUri());
 
         List<PolicyPropertyInfo> ppil = pci.getProperties();
@@ -1617,8 +1546,7 @@ public class MessageUtils {
             return null;
 
         for (PolicyPropertyInfo ppi : ppil) {
-            if (ppi.getPropName().equals(
-                    GENIE_BRIDGE_DOMAIN_TO_NETWORK_DOMAIN_TARGET)) {
+            if (ppi.getPropName().equals(GENIE_BRIDGE_DOMAIN_TO_NETWORK_DOMAIN_TARGET)) {
 
                 /*
                  * We have to move back to the tenant, since all of the
@@ -1639,8 +1567,7 @@ public class MessageUtils {
                  * We default to this being a routing domain reference if the
                  * actual reference can't be resolved.
                  */
-                PolicyReference pr = new PolicyReference(pci.getClassId(),
-                        uri.getUri());
+                PolicyReference pr = new PolicyReference(pci.getClassId(), uri.getUri());
                 poi.setReference(ppi.getPropId(), pr);
             }
         }
@@ -1658,8 +1585,7 @@ public class MessageUtils {
         return mol;
     }
 
-    public static List<ManagedObject> getL2BridgeDomainMo(PolicyUri current,
-            NetworkDomainId ndid, Tenant t) {
+    public static List<ManagedObject> getL2BridgeDomainMo(PolicyUri current, NetworkDomainId ndid, Tenant t) {
         List<L2BridgeDomain> l2bdl = t.getL2BridgeDomain();
         if (ndid == null || l2bdl == null)
             return null;
@@ -1702,15 +1628,13 @@ public class MessageUtils {
             if (ppi.getPropName().equals(GENIE_BRIDGE_DOMAIN_NAME)) {
                 poi.setString(ppi.getPropId(), l2bdMatch.getId().getValue());
             }
-            if (ppi.getPropName().equals(GENIE_BRIDGE_DOMAIN_TO_NETWORK_RN)
-                    && l2bdMatch.getParent() != null) {
+            if (ppi.getPropName().equals(GENIE_BRIDGE_DOMAIN_TO_NETWORK_RN) && l2bdMatch.getParent() != null) {
                 /*
                  * Add as a child, not a property, and get the child
                  */
                 PolicyUri child = new PolicyUri(prefix);
                 child.push(GENIE_BRIDGE_DOMAIN_TO_NETWORK_RN);
-                mol.addAll(getL2BridgeDomainRefMo(child, l2bdMatch.getParent(),
-                        t));
+                mol.addAll(getL2BridgeDomainRefMo(child, l2bdMatch.getParent(), t));
                 childrenUris.add(child.getUri());
             }
         }
@@ -1729,8 +1653,7 @@ public class MessageUtils {
         return mol;
     }
 
-    public static ManagedObject getL3ContextMo(PolicyUri current,
-            NetworkDomainId ndid, Tenant t) {
+    public static ManagedObject getL3ContextMo(PolicyUri current, NetworkDomainId ndid, Tenant t) {
         List<L3Context> l3cl = t.getL3Context();
         if (ndid == null || l3cl == null)
             return null;
@@ -1791,8 +1714,7 @@ public class MessageUtils {
      * @param t
      * @return
      */
-    public static List<ManagedObject> getNetwokDomainRefMo(PolicyUri current,
-            NetworkDomainId ndid, Tenant t) {
+    public static List<ManagedObject> getNetwokDomainRefMo(PolicyUri current, NetworkDomainId ndid, Tenant t) {
         if (ndid == null)
             return null;
         List<ManagedObject> mol = new ArrayList<ManagedObject>();
@@ -1808,8 +1730,7 @@ public class MessageUtils {
             return null;
 
         PolicyObjectInstance poi = new PolicyObjectInstance(pci.getClassId());
-        setParentFields(convertedUri, poi, GENIE_EPG_TO_NETWORK_DOMAIN_RN,
-                false);
+        setParentFields(convertedUri, poi, GENIE_EPG_TO_NETWORK_DOMAIN_RN, false);
         poi.setUri(convertedUri.getUri());
 
         List<PolicyPropertyInfo> ppil = pci.getProperties();
@@ -1863,8 +1784,7 @@ public class MessageUtils {
                  * We default to this being a routing domain reference if the
                  * actual reference can't be resolved.
                  */
-                PolicyReference pr = new PolicyReference(pci.getClassId(),
-                        uri.getUri());
+                PolicyReference pr = new PolicyReference(pci.getClassId(), uri.getUri());
                 poi.setReference(ppi.getPropId(), pr);
             }
         }
@@ -1882,8 +1802,8 @@ public class MessageUtils {
 
     }
 
-    public static Set<ManagedObject> getEndpointGroupMo(ManagedObject epgMo,
-            PolicyUri current, EndpointGroup epg, RuleGroup rg) {
+    public static Set<ManagedObject> getEndpointGroupMo(ManagedObject epgMo, PolicyUri current, EndpointGroup epg,
+            RuleGroup rg) {
         if (epg == null)
             return null;
 
@@ -1914,20 +1834,16 @@ public class MessageUtils {
 
         Contract c = rg.getRelatedContract();
         for (PolicyPropertyInfo ppi : ppil) {
-            if (ppi.getPropName().equals(GENIE_ENDPOINT_GROUP_NAME)
-                    && epg.getId() != null) {
+            if (ppi.getPropName().equals(GENIE_ENDPOINT_GROUP_NAME) && epg.getId() != null) {
                 poi.setString(ppi.getPropId(), epg.getId().getValue());
             }
-            if (ppi.getPropName().equals(GENIE_INTRA_EPG_RN)
-                    && epg.getIntraGroupPolicy() != null) {
-                poi.setUint64(ppi.getPropId(), intToBigInt(epg
-                        .getIntraGroupPolicy().getIntValue()));
+            if (ppi.getPropName().equals(GENIE_INTRA_EPG_RN) && epg.getIntraGroupPolicy() != null) {
+                poi.setUint64(ppi.getPropId(), intToBigInt(epg.getIntraGroupPolicy().getIntValue()));
             }
 
             // TODO: the following only maps named selectors. What about target
             // selectors?
-            if (ppi.getPropName().equals(GENIE_CONSUMER_CONTRACT_REF_RN)
-                    && epg.getConsumerNamedSelector() != null) {
+            if (ppi.getPropName().equals(GENIE_CONSUMER_CONTRACT_REF_RN) && epg.getConsumerNamedSelector() != null) {
                 // TODO: this does all the selectors -- should we just do those
                 // that are in scope?
                 for (ConsumerNamedSelector cns : epg.getConsumerNamedSelector()) {
@@ -1936,8 +1852,7 @@ public class MessageUtils {
                             PolicyUri child = new PolicyUri(prefix);
                             child.push(GENIE_CONSUMER_CONTRACT_REF_RN);
                             child.push(cns.getName().getValue());
-                            ManagedObject conMo = getConsumerNamedSelectorMo(
-                                    child, c);
+                            ManagedObject conMo = getConsumerNamedSelectorMo(child, c);
                             if (conMo != null) {
                                 mol.add(conMo);
                             }
@@ -1949,8 +1864,7 @@ public class MessageUtils {
 
             // TODO: the following only maps named selectors. What about target
             // selectors?
-            if (ppi.getPropName().equals(GENIE_PROVIDER_CONTRACT_REF_RN)
-                    && epg.getProviderNamedSelector() != null) {
+            if (ppi.getPropName().equals(GENIE_PROVIDER_CONTRACT_REF_RN) && epg.getProviderNamedSelector() != null) {
                 // TODO: this does all the selectors -- should we just do those
                 // that are in scope?
                 for (ProviderNamedSelector pns : epg.getProviderNamedSelector()) {
@@ -1959,8 +1873,7 @@ public class MessageUtils {
                             PolicyUri child = new PolicyUri(prefix);
                             child.push(GENIE_PROVIDER_CONTRACT_REF_RN);
                             child.push(pns.getName().getValue());
-                            ManagedObject provMo = getProviderNamedSelectorMo(
-                                    child, c);
+                            ManagedObject provMo = getProviderNamedSelectorMo(child, c);
                             if (provMo != null) {
                                 mol.add(provMo);
                             }
@@ -1972,12 +1885,10 @@ public class MessageUtils {
             /*
              * Don't bother getting network references if we have them already
              */
-            if (ppi.getPropName().equals(GENIE_EPG_TO_NETWORK_DOMAIN_RN)
-                    && epg.getNetworkDomain() != null) {
+            if (ppi.getPropName().equals(GENIE_EPG_TO_NETWORK_DOMAIN_RN) && epg.getNetworkDomain() != null) {
                 PolicyUri child = new PolicyUri(prefix);
                 child.push(GENIE_EPG_TO_NETWORK_DOMAIN_RN);
-                mol.addAll(MessageUtils.getNetwokDomainRefMo(child,
-                        epg.getNetworkDomain(), rg.getContractTenant()));
+                mol.addAll(MessageUtils.getNetwokDomainRefMo(child, epg.getNetworkDomain(), rg.getContractTenant()));
                 childrenUris.add(child.getUri());
             }
 
@@ -2003,8 +1914,7 @@ public class MessageUtils {
      * @param mo
      * @return
      */
-    public static EprOperation getEprOpFromEpMo(ManagedObject mo, int prr,
-            String agentId) {
+    public static EprOperation getEprOpFromEpMo(ManagedObject mo, int prr, String agentId) {
         MacAddress mac = null;
         EndpointGroupId epgid = null;
         L2BridgeDomainId l2bdid = null;
@@ -2036,45 +1946,42 @@ public class MessageUtils {
          */
         // TODO: add support for vector values
         for (PolicyPropertyInfo ppi : ppil) {
-            if (poi.isSet(ppi.getPropId(), ppi.getType(),
-                    ppi.getPropCardinality())) {
+            if (poi.isSet(ppi.getPropId(), ppi.getType(), ppi.getPropCardinality())) {
                 switch (ppi.getPropName()) {
-                case GENIE_ENDPOINT_MAC:
-                    mac = poi.getMacAddress(ppi.getPropId());
-                    break;
-                case GENIE_ENDPOINT_EPG:
-                    /*
-                     * This must be a full URI of the EPG -- otherwise, it can't
-                     * be uniquely resolved.
-                     */
-                    String epg = poi.getString(ppi.getPropId());
-                    epgid = new EndpointGroupId(epg);
-                    break;
-                case GENIE_ENDPOINT_CONTEXT:
-                    /*
-                     * It seems like this should be scoped by tenant as well,
-                     * which means it would have to be a full URI. If that's the
-                     * case, then the code below needs fixing.
-                     */
-                    if (mo.getSubject().equals(GENIE_ENDPOINT_RN)) {
-                        l2bdid = new L2BridgeDomainId(poi.getString(ppi
-                                .getPropId()));
-                    } else if (mo.getSubject().equals(GENIE_ENDPOINT_L3_RN)) {
-                        l3cid = new L3ContextId(poi.getString(ppi.getPropId()));
-                    }
-                    break;
-                case GENIE_ENDPOINT_UUID:
-                    uuid = poi.getString(ppi.getPropId());
-                    tid = new TenantId(uuid);
-                    break;
-                case GENIE_ENDPOINT_IP:
-                    // TODO: support v6
-                    Ipv4Address ipv4 = new Ipv4Address(poi.getString(ppi
-                            .getPropId()));
-                    ip = new IpAddress(ipv4);
-                    break;
-                default:
-                    break;
+                    case GENIE_ENDPOINT_MAC:
+                        mac = poi.getMacAddress(ppi.getPropId());
+                        break;
+                    case GENIE_ENDPOINT_EPG:
+                        /*
+                         * This must be a full URI of the EPG -- otherwise, it can't
+                         * be uniquely resolved.
+                         */
+                        String epg = poi.getString(ppi.getPropId());
+                        epgid = new EndpointGroupId(epg);
+                        break;
+                    case GENIE_ENDPOINT_CONTEXT:
+                        /*
+                         * It seems like this should be scoped by tenant as well,
+                         * which means it would have to be a full URI. If that's the
+                         * case, then the code below needs fixing.
+                         */
+                        if (mo.getSubject().equals(GENIE_ENDPOINT_RN)) {
+                            l2bdid = new L2BridgeDomainId(poi.getString(ppi.getPropId()));
+                        } else if (mo.getSubject().equals(GENIE_ENDPOINT_L3_RN)) {
+                            l3cid = new L3ContextId(poi.getString(ppi.getPropId()));
+                        }
+                        break;
+                    case GENIE_ENDPOINT_UUID:
+                        uuid = poi.getString(ppi.getPropId());
+                        tid = new TenantId(uuid);
+                        break;
+                    case GENIE_ENDPOINT_IP:
+                        // TODO: support v6
+                        Ipv4Address ipv4 = new Ipv4Address(poi.getString(ppi.getPropId()));
+                        ip = new IpAddress(ipv4);
+                        break;
+                    default:
+                        break;
                 }
             }
 
@@ -2155,8 +2062,7 @@ public class MessageUtils {
         return op;
     }
 
-    public static EprOperation getEprOpFromEpId(EndpointIdentity eid,
-            String subject) {
+    public static EprOperation getEprOpFromEpId(EndpointIdentity eid, String subject) {
         EprOperation op = null;
         Uri uri = eid.getContext();
         String rn = eid.getIdentifier();
@@ -2254,24 +2160,24 @@ public class MessageUtils {
         // TODO: add support for vector values
         for (PolicyPropertyInfo ppi : ppil) {
             switch (ppi.getPropName()) {
-            case GENIE_ENDPOINT_MAC:
-                poi.setMacAddress(ppi.getPropId(), mac);
-                break;
-            case GENIE_ENDPOINT_EPG:
-                poi.setString(ppi.getPropId(), epgid.getValue());
-                break;
-            case GENIE_ENDPOINT_CONTEXT:
-                poi.setString(ppi.getPropId(), context);
-                break;
-            case GENIE_ENDPOINT_IP:
-                // TODO: support v6
-                poi.setString(ppi.getPropId(), ip.toString());
-                break;
-            case GENIE_ENDPOINT_UUID:
-                poi.setString(ppi.getPropId(), uuid);
-                break;
-            default:
-                break;
+                case GENIE_ENDPOINT_MAC:
+                    poi.setMacAddress(ppi.getPropId(), mac);
+                    break;
+                case GENIE_ENDPOINT_EPG:
+                    poi.setString(ppi.getPropId(), epgid.getValue());
+                    break;
+                case GENIE_ENDPOINT_CONTEXT:
+                    poi.setString(ppi.getPropId(), context);
+                    break;
+                case GENIE_ENDPOINT_IP:
+                    // TODO: support v6
+                    poi.setString(ppi.getPropId(), ip.toString());
+                    break;
+                case GENIE_ENDPOINT_UUID:
+                    poi.setString(ppi.getPropId(), uuid);
+                    break;
+                default:
+                    break;
 
             }
         }
@@ -2340,22 +2246,22 @@ public class MessageUtils {
         // TODO: add support for vector values
         for (PolicyPropertyInfo ppi : ppil) {
             switch (ppi.getPropName()) {
-            case GENIE_ENDPOINT_MAC:
-                poi.setMacAddress(ppi.getPropId(), mac);
-                break;
-            case GENIE_ENDPOINT_EPG:
-                poi.setString(ppi.getPropId(), epgid.getValue());
-                break;
-            case GENIE_ENDPOINT_CONTEXT:
-                poi.setString(ppi.getPropId(), context);
-                break;
-            case GENIE_ENDPOINT_IP:
-                // TODO: support v6
-                poi.setString(ppi.getPropId(), ip.toString());
-                break;
-            case GENIE_ENDPOINT_UUID:
-            default:
-                break;
+                case GENIE_ENDPOINT_MAC:
+                    poi.setMacAddress(ppi.getPropId(), mac);
+                    break;
+                case GENIE_ENDPOINT_EPG:
+                    poi.setString(ppi.getPropId(), epgid.getValue());
+                    break;
+                case GENIE_ENDPOINT_CONTEXT:
+                    poi.setString(ppi.getPropId(), context);
+                    break;
+                case GENIE_ENDPOINT_IP:
+                    // TODO: support v6
+                    poi.setString(ppi.getPropId(), ip.toString());
+                    break;
+                case GENIE_ENDPOINT_UUID:
+                default:
+                    break;
 
             }
         }
@@ -2376,8 +2282,7 @@ public class MessageUtils {
         /*
          * Some sanity checks, to make sure we're dealing with the same MO
          */
-        if (!mo1.getSubject().equals(mo2.getSubject())
-                || !mo1.getUri().getValue().equals(mo2.getUri().getValue())) {
+        if (!mo1.getSubject().equals(mo2.getSubject()) || !mo1.getUri().getValue().equals(mo2.getUri().getValue())) {
             return;
         }
 
index 8b7b9a663b1ed6fa5d5d06922ec2f9d9e215a9b1..d91f0ce72bcb7900112a76d8660b45a41db626bd 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
+ * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -25,11 +25,12 @@ import org.slf4j.LoggerFactory;
 /**
  * Renderer that uses OpFlex to implement an overlay network
  * using Open vSwitch.
+ * 
  * @author tbachman
  */
 public class OpflexRenderer implements AutoCloseable {
-    private static final Logger LOG =
-            LoggerFactory.getLogger(OpflexRenderer.class);
+
+    private static final Logger LOG = LoggerFactory.getLogger(OpflexRenderer.class);
 
     private final PolicyResolver policyResolver;
     private final EndpointManager endpointManager;
@@ -40,8 +41,7 @@ public class OpflexRenderer implements AutoCloseable {
 
     ListenerRegistration<DataChangeListener> configReg;
 
-    public OpflexRenderer(DataBroker dataProvider,
-                             RpcProviderRegistry rpcRegistry) {
+    public OpflexRenderer(DataBroker dataProvider, RpcProviderRegistry rpcRegistry) {
         super();
 
         int numCPU = Runtime.getRuntime().availableProcessors();
@@ -54,14 +54,10 @@ public class OpflexRenderer implements AutoCloseable {
 
         connectionService = new OpflexConnectionService(dataProvider, executor);
 
-        endpointManager = new EndpointManager(dataProvider, rpcRegistry,
-                                              executor, connectionService, mitLibrary);
+        endpointManager = new EndpointManager(dataProvider, rpcRegistry, executor, connectionService, mitLibrary);
         policyResolver = new PolicyResolver(dataProvider, executor);
 
-        policyManager = new PolicyManager(policyResolver,
-                                          connectionService,
-                                          executor, mitLibrary);
-
+        policyManager = new PolicyManager(policyResolver, connectionService, executor, mitLibrary);
 
         LOG.info("Initialized OpFlex renderer");
     }
@@ -73,11 +69,16 @@ public class OpflexRenderer implements AutoCloseable {
     @Override
     public void close() throws Exception {
         executor.shutdownNow();
-        if (configReg != null) configReg.close();
-        if (policyResolver != null) policyResolver.close();
-        if (policyManager != null) policyManager.close();
-        if (connectionService != null) connectionService.close();
-        if (endpointManager != null) endpointManager.close();
+        if (configReg != null)
+            configReg.close();
+        if (policyResolver != null)
+            policyResolver.close();
+        if (policyManager != null)
+            policyManager.close();
+        if (connectionService != null)
+            connectionService.close();
+        if (endpointManager != null)
+            endpointManager.close();
     }
 
     // **************
index b300c34f1e63f440bde4b67f8ad1e41b0468dcf4..1caa37670dfce0591b2814daac473d5fc3f442ab 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
+ * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -54,17 +54,16 @@ import org.slf4j.LoggerFactory;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
-
 /**
  * Manage policies on agents by subscribing to updates from the
  * policy resolver and information about endpoints from the endpoint
  * registry
+ * 
  * @author tbachman
  */
-public class PolicyManager
-     implements PolicyListener, RpcBroker.RpcCallback, AutoCloseable  {
-    private static final Logger LOG =
-            LoggerFactory.getLogger(PolicyManager.class);
+public class PolicyManager implements PolicyListener, RpcBroker.RpcCallback, AutoCloseable {
+
+    private static final Logger LOG = LoggerFactory.getLogger(PolicyManager.class);
 
     private static final String UKNOWN_POLICY = "unknown policy name";
 
@@ -82,11 +81,8 @@ public class PolicyManager
     private ConcurrentHashMap<EgKey, Set<String>> epgSubscriptions;
     private RpcMessageMap messageMap = null;
 
-
-    public PolicyManager(PolicyResolver policyResolver,
-                         OpflexConnectionService connectionService,
-                         ScheduledExecutorService executor,
-                         MitLib mitLibrary) {
+    public PolicyManager(PolicyResolver policyResolver, OpflexConnectionService connectionService,
+            ScheduledExecutorService executor, MitLib mitLibrary) {
         super();
         this.executor = executor;
         this.policyResolver = policyResolver;
@@ -99,7 +95,7 @@ public class PolicyManager
         messageMap = new RpcMessageMap();
         List<RpcMessage> messages = Role.POLICY_REPOSITORY.getMessages();
         messageMap.addList(messages);
-        for (RpcMessage msg: messages) {
+        for (RpcMessage msg : messages) {
             this.connectionService.subscribe(msg, this);
         }
 
@@ -132,31 +128,31 @@ public class PolicyManager
     // **************
 
     /**
-     * Update all policy on all agents as needed.  Note that this will block
+     * Update all policy on all agents as needed. Note that this will block
      * one of the threads on the executor.
+     * 
      * @author tbachman
      */
     private void sendPolicyUpdates(Set<EgKey> updatedConsumers) {
         Map<String, Set<EgKey>> agentMap = new HashMap<String, Set<EgKey>>();
 
         PolicyInfo info = policyResolver.getCurrentPolicy();
-        if (info == null) return;
+        if (info == null)
+            return;
 
         /*
          * First build a per-agent set of EPGs that need updating
          */
-        for (EgKey cepg: updatedConsumers) {
+        for (EgKey cepg : updatedConsumers) {
 
-               /*
-                * Find the set of agents that have subscribed to
-                * updates for this EPG
-                */
-            for (String agentId: epgSubscriptions.get(cepg)) {
+            /*
+             * Find the set of agents that have subscribed to
+             * updates for this EPG
+             */
+            for (String agentId : epgSubscriptions.get(cepg)) {
                 Set<EgKey> egSet = agentMap.get(agentId);
                 if (egSet == null) {
-                    egSet =
-                          Collections.
-                          newSetFromMap(new ConcurrentHashMap<EgKey, Boolean>());
+                    egSet = Collections.newSetFromMap(new ConcurrentHashMap<EgKey, Boolean>());
                     agentMap.put(agentId, egSet);
                 }
                 egSet.add(cepg);
@@ -166,10 +162,10 @@ public class PolicyManager
         /*
          * Go through each agent and provide a single update for all EPGs
          */
-        for (Map.Entry<String,Set<EgKey>> entry: agentMap.entrySet()) {
-            OpflexAgent agent = connectionService.
-                    getOpflexAgent(entry.getKey());
-            if (agent == null) continue;
+        for (Map.Entry<String, Set<EgKey>> entry : agentMap.entrySet()) {
+            OpflexAgent agent = connectionService.getOpflexAgent(entry.getKey());
+            if (agent == null)
+                continue;
 
             sendPolicyUpdate(agent.getEndpoint(), entry.getValue(), info);
 
@@ -177,13 +173,13 @@ public class PolicyManager
     }
 
     /**
-     * This implements Runnable, which allows the {@link ScheduledExecutorservice}
-     * to execute the run() method to implement the update
+     * This implements Runnable, which allows the {@link ScheduledExecutorservice} to execute the
+     * run() method to implement the update
      *
      * @author tbachman
-     *
      */
     private class PolicyUpdate implements Runnable {
+
         private final JsonRpcEndpoint agent;
         private final Set<EgKey> epgSet;
         private final PolicyInfo info;
@@ -196,15 +192,11 @@ public class PolicyManager
 
         @Override
         public void run() {
-            List<ManagedObject> subtrees =
-                    new ArrayList<ManagedObject>();
+            List<ManagedObject> subtrees = new ArrayList<ManagedObject>();
 
-            PolicyUpdateRequest request =
-                    new PolicyUpdateRequest();
-            List<PolicyUpdateRequest.Params> paramsList =
-                    new ArrayList<>();
-            PolicyUpdateRequest.Params params =
-                    new PolicyUpdateRequest.Params();
+            PolicyUpdateRequest request = new PolicyUpdateRequest();
+            List<PolicyUpdateRequest.Params> paramsList = new ArrayList<>();
+            PolicyUpdateRequest.Params params = new PolicyUpdateRequest.Params();
 
             /*
              * We may need to optimize this in the future. Currently
@@ -215,14 +207,14 @@ public class PolicyManager
              * PolicyResolver to provide this delta, or we'd have to
              * keep cached state for each node.
              */
-            for (EgKey epg: epgSet) {
-               /*
-                * Get EPGs from the IndexedTenant, as the EPGs from
-                * the IndexedTenenat alread has collapsed the EPGs
-                * (i.e. inheritance accounted for)
-                *
-                * TODO: needed?
-                */
+            for (EgKey epg : epgSet) {
+                /*
+                 * Get EPGs from the IndexedTenant, as the EPGs from
+                 * the IndexedTenenat alread has collapsed the EPGs
+                 * (i.e. inheritance accounted for)
+                 * 
+                 * TODO: needed?
+                 */
 
                 IndexedTenant it = policyResolver.getTenant(epg.getTenantId());
                 List<ManagedObject> relatedMos = getPolicy(epg, info, it);
@@ -239,8 +231,7 @@ public class PolicyManager
             request.setParams(paramsList);
             try {
                 agent.sendRequest(request);
-            }
-            catch (Throwable t) {
+            } catch (Throwable t) {
 
             }
         }
@@ -250,9 +241,6 @@ public class PolicyManager
         executor.execute(new PolicyUpdate(agent, epgSet, info));
     }
 
-
-
-
     /**
      * This method creates {@link ManagedObject} POJOs for all of the
      * policy objects that need to be sent as a result of policy
@@ -261,36 +249,38 @@ public class PolicyManager
      * @param epg The Endpoint Group that was resolved
      * @param policySnapshot A snapshot of the current resolved policy
      */
-    private List<ManagedObject> getPolicy(EgKey epg,
-            PolicyInfo policySnapshot, IndexedTenant it) {
-        if (policySnapshot == null) return null;
+    private List<ManagedObject> getPolicy(EgKey epg, PolicyInfo policySnapshot, IndexedTenant it) {
+        if (policySnapshot == null)
+            return null;
 
         Set<ManagedObject> policyMos = Sets.newHashSet();
         Set<EgKey> peers = policySnapshot.getPeers(epg);
 
-        if (peers == null || peers.size() <= 0) return null;
+        if (peers == null || peers.size() <= 0)
+            return null;
 
         // Allocate an MO for the requested EPG
         ManagedObject epgMo = new ManagedObject();
-        for (EgKey depg: peers) {
-               /*
-                * Construct the base URI, so that we can
-                * continue adding on to create child MOs.
-                * We use the peer EPG for getting the policy
-                */
+        for (EgKey depg : peers) {
+            /*
+             * Construct the base URI, so that we can
+             * continue adding on to create child MOs.
+             * We use the peer EPG for getting the policy
+             */
             PolicyUri uri = new PolicyUri();
             uri.push(MessageUtils.TENANTS_RN);
             uri.push(MessageUtils.TENANT_RN);
             uri.push(depg.getTenantId().getValue());
 
             Policy policy = policySnapshot.getPolicy(epg, depg);
-            if (policy == null || policy == Policy.EMPTY) continue;
+            if (policy == null || policy == Policy.EMPTY)
+                continue;
 
             /*
              * We now have a policy that we need to send to the agent.
              * Provide empty condition lists for now - need to be
              * an actual empty list, instead of null
-             *
+             * 
              * TODO: get actual condition groups
              */
             List<ConditionName> conds = new ArrayList<ConditionName>();
@@ -303,10 +293,9 @@ public class PolicyManager
              * we need to keep track of contracts returned and merge
              * the results into a single ManagedObject
              */
-            Map<Contract, ManagedObject> contracts =
-                    new ConcurrentHashMap<Contract, ManagedObject>();
+            Map<Contract, ManagedObject> contracts = new ConcurrentHashMap<Contract, ManagedObject>();
 
-            for (RuleGroup rg: rgl) {
+            for (RuleGroup rg : rgl) {
 
                 /*
                  * Construct a new URI for the EPG requested.
@@ -319,42 +308,39 @@ public class PolicyManager
                 puri.push(epg.getTenantId().getValue());
                 puri.push(MessageUtils.EPG_RN);
                 puri.push(epg.getEgId().getValue());
-                Set<ManagedObject> epgMos = MessageUtils.
-                            getEndpointGroupMo(epgMo,
-                                               puri,
-                                               it.getEndpointGroup(epg.getEgId()),
-                                               rg);
+                Set<ManagedObject> epgMos = MessageUtils.getEndpointGroupMo(epgMo, puri,
+                        it.getEndpointGroup(epg.getEgId()), rg);
                 if (epgMos != null) {
                     policyMos.addAll(epgMos);
                 }
 
-
                 Contract c = rg.getRelatedContract();
-               /*
-                * This cmol list is used as a container to pass
-                * an out parameter for the contract MO. This MO
-                * is returned separately from the others because
-                * may require merging -- different RuleGroup
-                * objects can refer to the same contract
-                */
+                /*
+                 * This cmol list is used as a container to pass
+                 * an out parameter for the contract MO. This MO
+                 * is returned separately from the others because
+                 * may require merging -- different RuleGroup
+                 * objects can refer to the same contract
+                 */
                 List<ManagedObject> cmol = new ArrayList<ManagedObject>();
                 List<ManagedObject> mol = null;
 
                 uri.push(MessageUtils.CONTRACT_RN);
                 uri.push(c.getId().getValue());
                 mol = MessageUtils.getContractAndSubMos(cmol, uri, c, rg, it);
-                if (mol == null) continue;
+                if (mol == null)
+                    continue;
 
                 // walk back to the tenant for next contract URI
-                uri.pop(); uri.pop();
+                uri.pop();
+                uri.pop();
 
-                if(contracts.get(c) != null) {
+                if (contracts.get(c) != null) {
                     /*
                      * Aggregate the child URIs and properties.
                      */
-                       MessageUtils.mergeMos(contracts.get(c), cmol.remove(0));
-                }
-                else {
+                    MessageUtils.mergeMos(contracts.get(c), cmol.remove(0));
+                } else {
                     contracts.put(c, cmol.remove(0));
                 }
                 policyMos.addAll(mol);
@@ -372,11 +358,10 @@ public class PolicyManager
 
         Set<String> agents = epgSubscriptions.get(epgId);
         if (agents == null) {
-            agents = Collections.
-                    newSetFromMap(new ConcurrentHashMap<String, Boolean>());
+            agents = Collections.newSetFromMap(new ConcurrentHashMap<String, Boolean>());
             Set<String> result = epgSubscriptions.putIfAbsent(epgId, agents);
             if (result != null) {
-               agents = result;
+                agents = result;
             }
         }
         agents.add(endpoint.getIdentifier());
@@ -402,7 +387,7 @@ public class PolicyManager
         RpcMessage response = null;
 
         if (request instanceof PolicyResolveRequest) {
-            PolicyResolveRequest req = (PolicyResolveRequest)request;
+            PolicyResolveRequest req = (PolicyResolveRequest) request;
             PolicyResolveResponse msg = new PolicyResolveResponse();
             PolicyResolveResponse.Result result = new PolicyResolveResponse.Result();
             msg.setId(request.getId());
@@ -411,62 +396,59 @@ public class PolicyManager
                 LOG.warn("Invalid resolve request: {}", req);
                 OpflexError error = new OpflexError();
                 error.setCode(OpflexError.ErrorCode.ERROR.toString());
-                //error.setData(data);
-                //error.setMessage(message);
-                //error.setTrace(trace);
+                // error.setData(data);
+                // error.setMessage(message);
+                // error.setTrace(trace);
                 msg.setError(error);
             }
 
             Uri policyUri = null;
-               List<ManagedObject> mol = new ArrayList<ManagedObject>();
+            List<ManagedObject> mol = new ArrayList<ManagedObject>();
 
-            for (PolicyResolveRequest.Params p: req.getParams()) {
+            for (PolicyResolveRequest.Params p : req.getParams()) {
 
-               // Skip this if we already have an error
-               if (msg.getError() != null) break;
+                // Skip this if we already have an error
+                if (msg.getError() != null)
+                    break;
 
                 /*
-                * Only Policy Identity or Policy URI is present.
-                * Convert Policy Identities to a URI that we can use
-                */
+                 * Only Policy Identity or Policy URI is present.
+                 * Convert Policy Identities to a URI that we can use
+                 */
                 policyUri = p.getPolicy_uri();
-               if (policyUri == null) {
-                       Uri rn = p.getPolicy_ident().getContext();
-                       String name = p.getPolicy_ident().getName();
-                       PolicyUri puri = new PolicyUri(rn.getValue());
-                       puri.push(name);
-                       policyUri = puri.getUri();
-               }
-
-               // See if the request has an EPG in the URI
+                if (policyUri == null) {
+                    Uri rn = p.getPolicy_ident().getContext();
+                    String name = p.getPolicy_ident().getName();
+                    PolicyUri puri = new PolicyUri(rn.getValue());
+                    puri.push(name);
+                    policyUri = puri.getUri();
+                }
+
+                // See if the request has an EPG in the URI
                 if (MessageUtils.hasEpg(policyUri.getValue())) {
                     /*
                      * Keep track of EPGs requested by agents.
                      */
-                    EndpointGroupId egid = new EndpointGroupId(MessageUtils.
-                            getEndpointGroupFromUri(policyUri.getValue()));
-                    TenantId tid = new TenantId(MessageUtils.
-                            getTenantFromUri(policyUri.getValue()));
+                    EndpointGroupId egid = new EndpointGroupId(
+                            MessageUtils.getEndpointGroupFromUri(policyUri.getValue()));
+                    TenantId tid = new TenantId(MessageUtils.getTenantFromUri(policyUri.getValue()));
                     EgKey epgId = new EgKey(tid, egid);
 
                     addPolicySubscription(endpoint, epgId);
 
                     IndexedTenant it = policyResolver.getTenant(tid);
                     if (it != null) {
-                        List<ManagedObject> relatedMos =
-                                getPolicy(epgId, policyResolver.getCurrentPolicy(), it);
+                        List<ManagedObject> relatedMos = getPolicy(epgId, policyResolver.getCurrentPolicy(), it);
                         if (relatedMos != null) {
                             mol.addAll(relatedMos);
                         }
                     }
-                }
-                else {
-                    OpflexError error =
-                            new OpflexError();
+                } else {
+                    OpflexError error = new OpflexError();
                     error.setMessage(UKNOWN_POLICY);
                     error.setCode(OpflexError.ErrorCode.EUNSUPPORTED.toString());
-                    //error.setData(data);
-                    //error.setTrace(trace);
+                    // error.setData(data);
+                    // error.setTrace(trace);
                     msg.setError(error);
                 }
 
@@ -474,9 +456,8 @@ public class PolicyManager
             result.setPolicy(mol);
             msg.setResult(result);
             response = msg;
-        }
-        else if (request instanceof PolicyUnresolveRequest) {
-            PolicyUnresolveRequest req = (PolicyUnresolveRequest)request;
+        } else if (request instanceof PolicyUnresolveRequest) {
+            PolicyUnresolveRequest req = (PolicyUnresolveRequest) request;
             PolicyUnresolveResponse msg = new PolicyUnresolveResponse();
             msg.setId(request.getId());
             Uri policyUri;
@@ -484,46 +465,44 @@ public class PolicyManager
             if (!req.valid()) {
                 OpflexError error = new OpflexError();
                 error.setCode(OpflexError.ErrorCode.ERROR.toString());
-                //error.setData(data);
-                //error.setMessage(message);
-                //error.setTrace(trace);
+                // error.setData(data);
+                // error.setMessage(message);
+                // error.setTrace(trace);
                 msg.setError(error);
             }
 
-            for (PolicyUnresolveRequest.Params p: req.getParams()) {
+            for (PolicyUnresolveRequest.Params p : req.getParams()) {
 
-               // Skip this if we already have an error
-               if (msg.getError() != null) break;
+                // Skip this if we already have an error
+                if (msg.getError() != null)
+                    break;
 
                 /*
-                * Only Policy Identity or Policy URI is present.
-                * Convert to a URI that we'll use
-                */
+                 * Only Policy Identity or Policy URI is present.
+                 * Convert to a URI that we'll use
+                 */
                 policyUri = p.getPolicy_uri();
-               if (policyUri == null) {
-                       // Convert the RN/name to DN
-                       Uri rn = p.getPolicy_ident().getContext();
-                       String name = p.getPolicy_ident().getName();
-                       PolicyUri puri = new PolicyUri(rn.getValue());
-                       puri.push(name);
-                       policyUri = puri.getUri();
-               }
+                if (policyUri == null) {
+                    // Convert the RN/name to DN
+                    Uri rn = p.getPolicy_ident().getContext();
+                    String name = p.getPolicy_ident().getName();
+                    PolicyUri puri = new PolicyUri(rn.getValue());
+                    puri.push(name);
+                    policyUri = puri.getUri();
+                }
 
                 if (MessageUtils.hasEpg(policyUri.getValue())) {
                     /*
                      * Keep track of EPGs requested by agents.
                      */
-                    EndpointGroupId egid = new EndpointGroupId(MessageUtils.
-                            getEndpointGroupFromUri(policyUri.getValue()));
-                    TenantId tid = new TenantId(MessageUtils.
-                            getTenantFromUri(policyUri.getValue()));
+                    EndpointGroupId egid = new EndpointGroupId(
+                            MessageUtils.getEndpointGroupFromUri(policyUri.getValue()));
+                    TenantId tid = new TenantId(MessageUtils.getTenantFromUri(policyUri.getValue()));
                     EgKey epgId = new EgKey(tid, egid);
 
                     removePolicySubscription(endpoint, epgId);
-                }
-                else {
-                    OpflexError error =
-                            new OpflexError();
+                } else {
+                    OpflexError error = new OpflexError();
                     error.setMessage(UKNOWN_POLICY);
                     msg.setError(error);
                 }
@@ -532,12 +511,11 @@ public class PolicyManager
 
         }
         if (response != null) {
-               try {
-                   endpoint.sendResponse(response);
-               }
-               catch (Throwable t) {
+            try {
+                endpoint.sendResponse(response);
+            } catch (Throwable t) {
                 LOG.warn("Error sending response {}", t);
-               }
+            }
         }
 
     }
index 03693452a94814e1b1f63d1706780d97b688ecb5..f78ab1263e861e45797a065f1db75c183414e1ef 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib;
@@ -20,17 +20,16 @@ import org.opendaylight.groupbasedpolicy.jsonrpc.JsonRpcEndpoint;
  * for that server.
  *
  * @author tbachman
- *
  */
 public class OpflexAgent {
+
     String identity;
     String domain;
     List<Role> roles;
     JsonRpcEndpoint endpoint;
     OpflexRpcServer opflexServer;
 
-    public OpflexAgent() {
-    }
+    public OpflexAgent() {}
 
     /**
      * Get the OpFlex administrative domain for this agent
index 20fe25de46d4587091952f2a2805dfca28944f2e..47099e3745b9ba88f34abfd7005c627a2cca0880 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2013 Red Hat, Inc. Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Madhu Venugopal, Brent Salisbury, Evan Zeller, Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib;
@@ -55,18 +55,16 @@ import com.google.common.util.concurrent.ListenableFuture;
  * Manages the different OpFlex entity connections. It does this on behalf of
  * each logical OpFlex entity: o Policy Repositories o Endpoint Registries o
  * Observers
- *
  * Each OpFlex entity defines the JSON RPC methods supported, and manages their
  * connection/discovery using dedicated servers. Servers and connections are
  * maintained in dedicated client and server maps.
  *
  * @author tbachman
- *
  */
-public class OpflexConnectionService implements ConnectionService, RpcBroker,
-        RpcBroker.RpcCallback, DataChangeListener, AutoCloseable {
-    protected static final Logger logger = LoggerFactory
-            .getLogger(OpflexConnectionService.class);
+public class OpflexConnectionService implements ConnectionService, RpcBroker, RpcBroker.RpcCallback,
+        DataChangeListener, AutoCloseable {
+
+    protected static final Logger logger = LoggerFactory.getLogger(OpflexConnectionService.class);
 
     public static final String OPFLEX_DOMAIN = "default";
     static final String INVALID_DOMAIN = "Domain mismatch";
@@ -91,11 +89,10 @@ public class OpflexConnectionService implements ConnectionService, RpcBroker,
     private final DataBroker dataProvider;
     private RpcMessageMap messageMap = null;
 
-    public static final InstanceIdentifier<DiscoveryDefinitions> DISCOVERY_IID = InstanceIdentifier
-            .builder(DiscoveryDefinitions.class).build();
+    public static final InstanceIdentifier<DiscoveryDefinitions> DISCOVERY_IID = InstanceIdentifier.builder(
+            DiscoveryDefinitions.class).build();
 
-    public OpflexConnectionService(DataBroker salDataProvider,
-            ScheduledExecutorService executor) {
+    public OpflexConnectionService(DataBroker salDataProvider, ScheduledExecutorService executor) {
         this.dataProvider = salDataProvider;
         this.executor = executor;
 
@@ -129,10 +126,8 @@ public class OpflexConnectionService implements ConnectionService, RpcBroker,
 
         initializeServers();
 
-        this.dataListener = dataProvider.registerDataChangeListener(
-                LogicalDatastoreType.CONFIGURATION,
-                OpflexConnectionService.DISCOVERY_IID, this,
-                DataChangeScope.SUBTREE);
+        this.dataListener = dataProvider.registerDataChangeListener(LogicalDatastoreType.CONFIGURATION,
+                OpflexConnectionService.DISCOVERY_IID, this, DataChangeScope.SUBTREE);
     }
 
     private List<OpflexRpcServer> setDefaultIdentities() {
@@ -155,13 +150,11 @@ public class OpflexConnectionService implements ConnectionService, RpcBroker,
 
     }
 
-    private List<OpflexRpcServer> createServerList(
-            DiscoveryDefinitions identities) {
+    private List<OpflexRpcServer> createServerList(DiscoveryDefinitions identities) {
 
         if (identities != null) {
             Map<String, OpflexRpcServer> servers = new ConcurrentHashMap<String, OpflexRpcServer>();
-            List<String> addList = getPolicyRepositories(identities
-                    .getPolicyRepository());
+            List<String> addList = getPolicyRepositories(identities.getPolicyRepository());
             addServerList(servers, addList, Role.POLICY_REPOSITORY);
             addList = getEndpointRegistries(identities.getEndpointRegistry());
             addServerList(servers, addList, Role.ENDPOINT_REGISTRY);
@@ -183,8 +176,7 @@ public class OpflexConnectionService implements ConnectionService, RpcBroker,
 
     }
 
-    private List<String> getPolicyRepositories(
-            List<PolicyRepository> repositories) {
+    private List<String> getPolicyRepositories(List<PolicyRepository> repositories) {
         List<String> identityList = new ArrayList<String>();
         if (repositories == null)
             return null;
@@ -217,8 +209,7 @@ public class OpflexConnectionService implements ConnectionService, RpcBroker,
         return identityList;
     }
 
-    private void addServerList(Map<String, OpflexRpcServer> servers,
-            List<String> idList, Role role) {
+    private void addServerList(Map<String, OpflexRpcServer> servers, List<String> idList, Role role) {
         if (idList == null || idList.size() <= 0)
             return;
 
@@ -243,9 +234,8 @@ public class OpflexConnectionService implements ConnectionService, RpcBroker,
      * Find the {@link OpflexAgent} that owns this {@link JsonRpcEndpoint}.
      *
      * @param endpoint
-     *            The endpoint to look up
+     *        The endpoint to look up
      * @return The OpflexConnection that owns this endpoint
-     *
      *         TODO: should throw an exception of there is no OpflexConnection
      *         that contains this endpoint
      */
@@ -258,18 +248,16 @@ public class OpflexConnectionService implements ConnectionService, RpcBroker,
      * Get the OpflexRpcServer that spawned this endpoint.
      *
      * @param endpoint
-     *            The endpoint to look up
+     *        The endpoint to look up
      * @return The OpflexRpcServer that owns this endpoint, or null if the
      *         server no longer exists
-     *
      *         TODO: exception if the endpoint is owned by anything
      */
     public OpflexRpcServer getOpflexServer(JsonRpcEndpoint endpoint) {
         if (endpoint.getContext() instanceof OpflexRpcServer) {
             return (OpflexRpcServer) endpoint.getContext();
         }
-        logger.warn("Couldn't find OpflexConnection for endpoint {}",
-                endpoint.getIdentifier());
+        logger.warn("Couldn't find OpflexConnection for endpoint {}", endpoint.getIdentifier());
         return null;
     }
 
@@ -292,8 +280,7 @@ public class OpflexConnectionService implements ConnectionService, RpcBroker,
         return opflexServers;
     }
 
-    public void setOpflexServers(
-            ConcurrentMap<String, OpflexRpcServer> opflexServers) {
+    public void setOpflexServers(ConcurrentMap<String, OpflexRpcServer> opflexServers) {
         this.opflexServers = opflexServers;
     }
 
@@ -333,7 +320,7 @@ public class OpflexConnectionService implements ConnectionService, RpcBroker,
      * Add an {@link OpflexAgent} to the domain
      *
      * @param agent
-     *            The agent to add
+     *        The agent to add
      */
     public void addOpflexAgent(OpflexAgent agent) {
         opflexAgents.put(agent.getIdentity(), agent);
@@ -343,7 +330,7 @@ public class OpflexConnectionService implements ConnectionService, RpcBroker,
      * Return the {@link OpflexAgent} associated with this identity
      *
      * @param identity
-     *            A string representing the connections identity
+     *        A string representing the connections identity
      * @return The connection represented by that key, or null if not found
      */
     public OpflexAgent getOpflexAgent(String identity) {
@@ -354,7 +341,7 @@ public class OpflexConnectionService implements ConnectionService, RpcBroker,
      * Add the List of servers to the domain
      *
      * @param serverList
-     *            List of new servers to start
+     *        List of new servers to start
      */
     public void addServers(List<OpflexRpcServer> serverList) {
 
@@ -369,8 +356,7 @@ public class OpflexConnectionService implements ConnectionService, RpcBroker,
             OpflexRpcServer server = opflexServers.get(srv.getId());
             if (server != null) {
                 if (!server.sameServer(srv)) {
-                    OpflexRpcServer oldServer = opflexServers.remove(srv
-                            .getId());
+                    OpflexRpcServer oldServer = opflexServers.remove(srv.getId());
                     if (oldServer != null && oldServer.getRpcServer() != null
                             && oldServer.getRpcServer().getChannel() != null) {
                         oldServer.getRpcServer().getChannel().disconnect();
@@ -389,10 +375,9 @@ public class OpflexConnectionService implements ConnectionService, RpcBroker,
      * Drop the list of servers from the domain
      *
      * @param oldServers
-     *            The list of servers to drop
-     *
-     *            TODO: Should we provide notifications to or close the
-     *            connections that were spawned by the deleted servers?
+     *        The list of servers to drop
+     *        TODO: Should we provide notifications to or close the
+     *        connections that were spawned by the deleted servers?
      */
     public void dropServers(List<String> oldServers) {
         OpflexRpcServer server;
@@ -415,7 +400,7 @@ public class OpflexConnectionService implements ConnectionService, RpcBroker,
      * the updated parameters.
      *
      * @param serverList
-     *            The new server configurations
+     *        The new server configurations
      */
     public void updateServers(List<OpflexRpcServer> serverList) {
         /* Get the new list of configured servers in this domain */
@@ -457,22 +442,20 @@ public class OpflexConnectionService implements ConnectionService, RpcBroker,
     }
 
     private void readConfig() {
-        ListenableFuture<Optional<DiscoveryDefinitions>> dao = dataProvider
-                .newReadOnlyTransaction().read(
-                        LogicalDatastoreType.CONFIGURATION, DISCOVERY_IID);
-        Futures.addCallback(dao,
-                new FutureCallback<Optional<DiscoveryDefinitions>>() {
-                    @Override
-                    public void onSuccess(
-                            final Optional<DiscoveryDefinitions> result) {
-                        getNewConfig(result);
-                    }
+        ListenableFuture<Optional<DiscoveryDefinitions>> dao = dataProvider.newReadOnlyTransaction().read(
+                LogicalDatastoreType.CONFIGURATION, DISCOVERY_IID);
+        Futures.addCallback(dao, new FutureCallback<Optional<DiscoveryDefinitions>>() {
 
-                    @Override
-                    public void onFailure(Throwable t) {
-                        logger.error("Failed to read configuration", t);
-                    }
-                }, executor);
+            @Override
+            public void onSuccess(final Optional<DiscoveryDefinitions> result) {
+                getNewConfig(result);
+            }
+
+            @Override
+            public void onFailure(Throwable t) {
+                logger.error("Failed to read configuration", t);
+            }
+        }, executor);
     }
 
     void getNewConfig(final Optional<DiscoveryDefinitions> result) {
@@ -550,8 +533,7 @@ public class OpflexConnectionService implements ConnectionService, RpcBroker,
     // ******************
 
     @Override
-    public void onDataChanged(
-            final AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> change) {
+    public void onDataChanged(final AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> change) {
 
         readConfig();
     }
@@ -591,15 +573,12 @@ public class OpflexConnectionService implements ConnectionService, RpcBroker,
 
     /**
      * Publish the {@link RpcMessage} to all subscribers.
-     *
      */
     @Override
-    public synchronized void publish(JsonRpcEndpoint endpoint,
-            RpcMessage message) {
+    public synchronized void publish(JsonRpcEndpoint endpoint, RpcMessage message) {
         List<RpcCallback> cbList = brokerMap.get(message.getName());
         if (cbList == null) {
-            System.out
-                    .println("Unhandled Message name is " + message.getName());
+            System.out.println("Unhandled Message name is " + message.getName());
             return;
         }
 
@@ -703,8 +682,7 @@ public class OpflexConnectionService implements ConnectionService, RpcBroker,
          * etc. to create the containing connection object.
          */
         if (!(endpoint.getContext() instanceof OpflexRpcServer)) {
-            logger.error("Connection for endpoint {} invalid",
-                    endpoint.getIdentifier());
+            logger.error("Connection for endpoint {} invalid", endpoint.getIdentifier());
             // TODO: close connection?
             return;
         }
@@ -714,7 +692,7 @@ public class OpflexConnectionService implements ConnectionService, RpcBroker,
         /*
          * The OpFlex domain is the same as the server that the agent connected
          * to. Look up the OpFlex RPC server using the server socket.
-         *
+         * 
          * It's possible that the server was closed or changed between the
          * connection establishment and now (race condition). Treat that as a
          * failure, closing the connection.
index b9a5604707cab0f98ec6d06303ab66af0868be1f..88416ff8b377e9836eea8473c4ce2e8d303a6c8d 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib;
@@ -23,7 +23,6 @@ import org.opendaylight.groupbasedpolicy.jsonrpc.RpcServer;
  * the server is closed
  *
  * @author tbachman
- *
  */
 public class OpflexRpcServer {
 
@@ -41,7 +40,7 @@ public class OpflexRpcServer {
         if (id.split(":").length == 2) {
             this.identity = id;
             this.address = id.split(":")[0];
-            this.port =  Integer.parseInt(id.split(":")[1]);
+            this.port = Integer.parseInt(id.split(":")[1]);
         }
     }
 
@@ -99,14 +98,13 @@ public class OpflexRpcServer {
      * configured. It creates an {@link RpcServer} object,
      * passes it the context owned by the {@link OpflexRpcServer},
      * and starts the server in its own thread.
-     *
      * TODO: should use executor service instead?
      */
     public void start() {
         rpcServer.setConnectionService(connectionService);
         rpcServer.setRpcBroker(rpcBroker);
 
-        for ( Role role : roles ) {
+        for (Role role : roles) {
             rpcServer.addMessageList(role.getMessages());
         }
         /*
@@ -115,12 +113,14 @@ public class OpflexRpcServer {
         rpcServer.addMessageList(Role.DISCOVERY.getMessages());
 
         new Thread() {
+
             private RpcServer server;
 
             public Thread initializeServerParams(RpcServer srv) {
                 this.server = srv;
                 return this;
             }
+
             @Override
             public void run() {
                 try {
@@ -152,15 +152,13 @@ public class OpflexRpcServer {
             return false;
         if (!this.identity.equals(srv.identity))
             return false;
-        if (this.domain == null ||
-                !this.domain.equals(srv.getDomain()))
+        if (this.domain == null || !this.domain.equals(srv.getDomain()))
             return false;
         if (this.roles == null && srv.roles == null)
             return true;
         if (this.roles == null || srv.roles == null)
             return false;
-        if (this.roles.size() == srv.roles.size()
-                && this.roles.containsAll(srv.roles))
+        if (this.roles.size() == srv.roles.size() && this.roles.containsAll(srv.roles))
             return true;
         return false;
     }
index a9bb61c8a6c076494d68e14304a442d5f2271d72..13d4506a097a4a1e3c42b71a5b55ef32abc25875 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib;
@@ -35,14 +35,10 @@ import org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages.PolicyUpda
  * Enum for OpFlex roles and their supported messages
  *
  * @author tbachman
- *
  */
 public enum Role {
-    DISCOVERY("discovery"),
-    POLICY_REPOSITORY("policy_repository"),
-    ENDPOINT_REGISTRY("endpoint_registry"),
-    OBSERVER("observer"),
-    POLICY_ELEMENT("policy_element");
+    DISCOVERY("discovery"), POLICY_REPOSITORY("policy_repository"), ENDPOINT_REGISTRY("endpoint_registry"), OBSERVER(
+            "observer"), POLICY_ELEMENT("policy_element");
 
     static IdentityRequest idReq = new IdentityRequest();
     static IdentityResponse idRsp = new IdentityResponse();
@@ -79,8 +75,7 @@ public enum Role {
             msgList.add(idReq);
             msgList.add(idRsp);
             return msgList;
-        }
-        else if (role.equals(POLICY_REPOSITORY.toString())) {
+        } else if (role.equals(POLICY_REPOSITORY.toString())) {
             List<RpcMessage> msgList = new ArrayList<RpcMessage>();
             msgList.add(polReq);
             msgList.add(polUpdReq);
@@ -88,8 +83,7 @@ public enum Role {
             msgList.add(polUnReq);
             msgList.add(polUnRsp);
             return msgList;
-        }
-        else if (role.equals(ENDPOINT_REGISTRY.toString())) {
+        } else if (role.equals(ENDPOINT_REGISTRY.toString())) {
             List<RpcMessage> msgList = new ArrayList<RpcMessage>();
             msgList.add(epDeclReq);
             msgList.add(epUndeclReq);
@@ -98,8 +92,7 @@ public enum Role {
             msgList.add(epPolUpdReq);
             msgList.add(epPolUpdRsp);
             return msgList;
-        }
-        else if (role.equals(OBSERVER.toString())) {
+        } else if (role.equals(OBSERVER.toString())) {
             List<RpcMessage> msgList = new ArrayList<RpcMessage>();
             return msgList;
         }
@@ -110,4 +103,4 @@ public enum Role {
     public String toString() {
         return this.role;
     }
-}
\ No newline at end of file
+}
index 2179c26485b51342287fb4b41c9d1bd18cacd398..b5a72495e03ae56e11710ea8d073bdc75f1d8dd1 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -25,21 +25,27 @@ public class EndpointDeclareRequest extends RpcMessage {
     public static final String DECLARE_MESSAGE = "endpoint_declare";
 
     static public class Params {
+
         private List<ManagedObject> endpoint;
         private int prr;
+
         public List<ManagedObject> getEndpoint() {
             return endpoint;
         }
+
         public void setEndpoint(List<ManagedObject> endpoint) {
             this.endpoint = endpoint;
         }
+
         public int getPrr() {
             return prr;
         }
+
         public void setPrr(int prr) {
             this.prr = prr;
         }
     }
+
     private JsonNode id;
     private String method;
     private List<Params> params;
@@ -96,6 +102,7 @@ public class EndpointDeclareRequest extends RpcMessage {
 
     /**
      * Minimal check on validity of message
+     * 
      * @return true if message has passed validity check
      */
     @JsonIgnore
index 6824077d59828d60e4c9fc6917ebee297029a5ed..a87b6e98baa2ce11e39231ab9c33d22d6e6b8574 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -58,8 +58,7 @@ public class EndpointDeclareResponse extends RpcMessage {
     }
 
     @Override
-    public void setMethod(String method) {
-    }
+    public void setMethod(String method) {}
 
     public Result getResult() {
         return this.result;
@@ -86,6 +85,7 @@ public class EndpointDeclareResponse extends RpcMessage {
     public void setName(String name) {
         this.name = name;
     }
+
     @JsonIgnore
     @Override
     public boolean valid() {
index 331df7a81236004b54000adb06a4a34ec9af5e82..bf5ecaea761312d47fbece6505bfbe67824de4d7 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -12,20 +12,24 @@ package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri;
 
 public class EndpointIdentity {
-       private String identifier;
-       private Uri context;
-
-       public String getIdentifier() {
-               return identifier;
-       }
-       public void setIdentifier(String identifier) {
-               this.identifier = identifier;
-       }
-       public Uri getContext() {
-               return context;
-       }
-       public void setContext(Uri context) {
-               this.context = context;
-       }
+
+    private String identifier;
+    private Uri context;
+
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+    }
+
+    public Uri getContext() {
+        return context;
+    }
+
+    public void setContext(Uri context) {
+        this.context = context;
+    }
 
 }
index a6c85b6448094acaa1bd3bba69afd9042795edd9..aeb052ee67c35de198db6f4560068628fd1d5bef 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -26,6 +26,7 @@ public class EndpointResolveRequest extends RpcMessage {
     public static final String EP_RESOLVE_REQUEST_MESSAGE = "endpoint_resolve";
 
     static public class Params {
+
         private String subject;
         private Uri endpoint_uri;
         private EndpointIdentity endpoint_ident;
@@ -34,28 +35,36 @@ public class EndpointResolveRequest extends RpcMessage {
         public String getSubject() {
             return subject;
         }
+
         public void setSubject(String subject) {
             this.subject = subject;
         }
+
         public Uri getEndpoint_uri() {
             return endpoint_uri;
         }
+
         public void setEndpoint_uri(Uri endpoint_uri) {
             this.endpoint_uri = endpoint_uri;
         }
+
         public EndpointIdentity getEndpoint_ident() {
             return endpoint_ident;
         }
+
         public void setEndpoint_ident(EndpointIdentity endpoint_ident) {
             this.endpoint_ident = endpoint_ident;
         }
+
         public int getPrr() {
             return prr;
         }
+
         public void setPrr(int prr) {
             this.prr = prr;
         }
     }
+
     private JsonNode id;
     private String method;
     private List<Params> params;
@@ -111,6 +120,7 @@ public class EndpointResolveRequest extends RpcMessage {
 
     /**
      * Minimal check on validity of message
+     * 
      * @return true if message has passed validity check
      */
     @JsonIgnore
index 2b4ec4578fcca81789c245f03d67f0a60e2980f0..849a84a5196c6b134965eb34bf70da87f6764b9b 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -25,6 +25,7 @@ public class EndpointResolveResponse extends RpcMessage {
     public static final String EPP_RESOLVE_MESSAGE_RESPONSE = "endpoint_resolve_response";
 
     static public class Result {
+
         List<ManagedObject> endpoint;
 
         public List<ManagedObject> getEndpoint() {
@@ -36,7 +37,6 @@ public class EndpointResolveResponse extends RpcMessage {
         }
     }
 
-
     private JsonNode id;
     private Result result;
     private OpflexError error;
@@ -70,8 +70,7 @@ public class EndpointResolveResponse extends RpcMessage {
     }
 
     @Override
-    public void setMethod(String method) {
-    }
+    public void setMethod(String method) {}
 
     public Result getResult() {
         return this.result;
@@ -98,6 +97,7 @@ public class EndpointResolveResponse extends RpcMessage {
     public EndpointResolveResponse() {
         this.name = EPP_RESOLVE_MESSAGE_RESPONSE;
     }
+
     @JsonIgnore
     @Override
     public boolean valid() {
index bfce566aec8785a579f43bf4fca4dad7361db512..2696b60c6092cec0134067f9674ce90589e0728b 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -22,22 +22,27 @@ public class EndpointUndeclareRequest extends RpcMessage {
     public static final String UNDECLARE_MESSAGE = "endpoint_undeclare";
 
     static public class Params {
+
         private String subject;
         private Uri endpoint_uri;
 
-               public String getSubject() {
-                       return subject;
-               }
-               public void setSubject(String subject) {
-                       this.subject = subject;
-               }
-               public Uri getEndpoint_uri() {
-                       return endpoint_uri;
-               }
-               public void setEndpoint_uri(Uri endpoint_uri) {
-                       this.endpoint_uri = endpoint_uri;
-               }
+        public String getSubject() {
+            return subject;
+        }
+
+        public void setSubject(String subject) {
+            this.subject = subject;
+        }
+
+        public Uri getEndpoint_uri() {
+            return endpoint_uri;
+        }
+
+        public void setEndpoint_uri(Uri endpoint_uri) {
+            this.endpoint_uri = endpoint_uri;
+        }
     }
+
     private JsonNode id;
     private String method;
     private List<Params> params;
@@ -94,6 +99,7 @@ public class EndpointUndeclareRequest extends RpcMessage {
 
     /**
      * Minimal check on validity of message
+     * 
      * @return true if message has passed validity check
      */
     @JsonIgnore
index 3eef2040a803cf2d58a218dd749e9c0a9187de39..bf75717c5d57c1810fa61eec855d0160355e326b 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -18,7 +18,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 @JsonSerialize
 @JsonDeserialize
-public class EndpointUndeclareResponse extends RpcMessage  {
+public class EndpointUndeclareResponse extends RpcMessage {
 
     public static final String ENDPOINT_UNDECLARE_RESPONSE = "endpoint_undeclare_response";
 
@@ -58,8 +58,7 @@ public class EndpointUndeclareResponse extends RpcMessage  {
     }
 
     @Override
-    public void setMethod(String method) {
-    }
+    public void setMethod(String method) {}
 
     public Result getResult() {
         return this.result;
@@ -86,11 +85,11 @@ public class EndpointUndeclareResponse extends RpcMessage  {
     public void setName(String name) {
         this.name = name;
     }
+
     @JsonIgnore
     @Override
     public boolean valid() {
         return true;
     }
 
-
 }
index 68b1c00224b8ccbdc3a2c0f91a274ee81315b92a..eca28063c1e9cb34d2a57a26c36ef81312c0fe01 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -26,28 +26,36 @@ public class EndpointUnresolveRequest extends RpcMessage {
     public static final String EP_UNRESOLVE_REQUEST_MESSAGE = "endpoint_unresolve";
 
     static public class Params {
+
         private String subject;
         private Uri endpoint_uri;
         private EndpointIdentity endpoint_ident;
+
         public String getSubject() {
             return subject;
         }
+
         public void setSubject(String subject) {
             this.subject = subject;
         }
+
         public Uri getEndpoint_uri() {
             return endpoint_uri;
         }
+
         public void setEndpoint_uri(Uri endpoint_uri) {
             this.endpoint_uri = endpoint_uri;
         }
+
         public EndpointIdentity getEndpoint_ident() {
             return endpoint_ident;
         }
+
         public void setEndpoint_ident(EndpointIdentity endpoint_ident) {
             this.endpoint_ident = endpoint_ident;
         }
     }
+
     private JsonNode id;
     private String method;
     private List<Params> params;
@@ -103,6 +111,7 @@ public class EndpointUnresolveRequest extends RpcMessage {
 
     /**
      * Minimal check on validity of message
+     * 
      * @return true if message has passed validity check
      */
     @JsonIgnore
index da2dc719a7d3681378135e4c450338534bf6e2a9..ea4afe9c8aaf2e157ef9f386e68eeb8b40ec4337 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -19,12 +19,12 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 @JsonSerialize
 @JsonDeserialize
 public class EndpointUnresolveResponse extends RpcMessage {
+
     public static final String EPP_UNRESOLVE_MESSAGE_RESPONSE = "endpoint_unresolve_response";
 
     static public class Result {
     }
 
-
     private JsonNode id;
     private Result result;
     private OpflexError error;
@@ -58,8 +58,7 @@ public class EndpointUnresolveResponse extends RpcMessage {
     }
 
     @Override
-    public void setMethod(String method) {
-    }
+    public void setMethod(String method) {}
 
     public Result getResult() {
         return this.result;
@@ -86,11 +85,11 @@ public class EndpointUnresolveResponse extends RpcMessage {
     public EndpointUnresolveResponse() {
         this.name = EPP_UNRESOLVE_MESSAGE_RESPONSE;
     }
+
     @JsonIgnore
     @Override
     public boolean valid() {
         return true;
     }
 
-
 }
index a99a2fca35a97d5b7719385cc60ad166dd92c9bd..96f7294469b5b384b36500a00caefa15216a0636 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -26,22 +26,27 @@ public class EndpointUpdateRequest extends RpcMessage {
     public static final String EP_UPDATE_MESSAGE = "endpoint_update";
 
     static public class Params {
+
         private List<ManagedObject> replace;
         private List<Uri> delete_uri;
 
         public List<ManagedObject> getReplace() {
             return replace;
         }
+
         public void setReplace(List<ManagedObject> replace) {
             this.replace = replace;
         }
+
         public List<Uri> getDelete_uri() {
             return delete_uri;
         }
+
         public void setDelete_uri(List<Uri> delete_uri) {
             this.delete_uri = delete_uri;
         }
     }
+
     private JsonNode id;
     private String method;
     private List<Params> params;
@@ -98,6 +103,7 @@ public class EndpointUpdateRequest extends RpcMessage {
 
     /**
      * Minimal check on validity of message
+     * 
      * @return true if message has passed validity check
      */
     @JsonIgnore
index add69a6fb413bd9c38b295db2490dfd29c94db7f..a14e199994b56e2627dd2be5c274f55fcd18aa2b 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -58,8 +58,7 @@ public class EndpointUpdateResponse extends RpcMessage {
     }
 
     @Override
-    public void setMethod(String method) {
-    }
+    public void setMethod(String method) {}
 
     public Result getResult() {
         return this.result;
@@ -86,11 +85,11 @@ public class EndpointUpdateResponse extends RpcMessage {
     public void setName(String name) {
         this.name = name;
     }
+
     @JsonIgnore
     @Override
     public boolean valid() {
         return true;
     }
 
-
 }
index 19aa1d4877ae189cdef50422571c4d10bb12c418..5b993c23b3f18df4f1365e1c8fe506af3894b824 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -27,10 +27,12 @@ public class IdentityRequest extends RpcMessage {
     public static final String OPFLEX_PROTOCOL_VERSION = "1.0";
 
     static public class Params {
-       private final String proto_version;
+
+        private final String proto_version;
         private String name;
         private String domain;
         private List<String> my_role;
+
         public String getName() {
             return this.name;
         }
@@ -40,12 +42,12 @@ public class IdentityRequest extends RpcMessage {
         }
 
         public Params() {
-               this.proto_version = OPFLEX_PROTOCOL_VERSION;
+            this.proto_version = OPFLEX_PROTOCOL_VERSION;
             my_role = new ArrayList<String>();
         }
 
         public String getProto_version() {
-               return proto_version;
+            return proto_version;
         }
 
         public String getDomain() {
@@ -64,8 +66,8 @@ public class IdentityRequest extends RpcMessage {
             this.my_role = my_role;
         }
 
-
     }
+
     private JsonNode id;
     private String method;
     private List<Params> params;
@@ -122,6 +124,7 @@ public class IdentityRequest extends RpcMessage {
 
     /**
      * Minimal check on validity of message
+     * 
      * @return true if message has passed validity check
      */
     @JsonIgnore
index 48d754b2b33cdca439de705f151654e8671d204b..3b28b86b0f48d3e9edc1964affc71cee29181138 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -26,6 +26,7 @@ public class IdentityResponse extends RpcMessage {
     public static final String IDENTITY_MESSAGE_RESPONSE = "send_identity_response";
 
     static public class Peer {
+
         private List<String> role;
         private String connectivity_info;
 
@@ -45,11 +46,11 @@ public class IdentityResponse extends RpcMessage {
             this.connectivity_info = connectivity_info;
         }
 
-        public Peer() {
-        }
+        public Peer() {}
     }
 
     static public class Result {
+
         private String name;
         private String domain;
         private List<String> my_role;
@@ -92,6 +93,7 @@ public class IdentityResponse extends RpcMessage {
         }
 
     }
+
     private JsonNode id;
     private Result result;
     private OpflexError error;
@@ -125,8 +127,7 @@ public class IdentityResponse extends RpcMessage {
     }
 
     @Override
-    public void setMethod(String method) {
-    }
+    public void setMethod(String method) {}
 
     public Result getResult() {
         return this.result;
index 30db813051c19d4da4c9ba46343f3ca50dd86ae2..f3e861a991de622bca67f637d009d92eeedfdb95 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -21,50 +21,57 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 @JsonDeserialize
 public class ManagedObject {
 
-       public static class Property {
+    public static class Property {
+
         private String name;
         private JsonNode data;
+
         public String getName() {
             return name;
         }
+
         public void setName(String name) {
             this.name = name;
         }
+
         public JsonNode getData() {
             return data;
         }
+
         public void setData(JsonNode data) {
             this.data = data;
         }
-               @Override
-               public int hashCode() {
-                       final int prime = 31;
-                       int result = 1;
-                       result = prime * result + ((data == null) ? 0 : data.hashCode());
-                       result = prime * result + ((name == null) ? 0 : name.hashCode());
-                       return result;
-               }
-               @Override
-               public boolean equals(Object obj) {
-                       if (this == obj)
-                               return true;
-                       if (obj == null)
-                               return false;
-                       if (getClass() != obj.getClass())
-                               return false;
-                       Property other = (Property) obj;
-                       if (data == null) {
-                               if (other.data != null)
-                                       return false;
-                       } else if (!data.asText().equals(other.getData().asText()))
-                               return false;
-                       if (name == null) {
-                               if (other.name != null)
-                                       return false;
-                       } else if (!name.equals(other.name))
-                               return false;
-                       return true;
-               }
+
+        @Override
+        public int hashCode() {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + ((data == null) ? 0 : data.hashCode());
+            result = prime * result + ((name == null) ? 0 : name.hashCode());
+            return result;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj)
+                return true;
+            if (obj == null)
+                return false;
+            if (getClass() != obj.getClass())
+                return false;
+            Property other = (Property) obj;
+            if (data == null) {
+                if (other.data != null)
+                    return false;
+            } else if (!data.asText().equals(other.getData().asText()))
+                return false;
+            if (name == null) {
+                if (other.name != null)
+                    return false;
+            } else if (!name.equals(other.name))
+                return false;
+            return true;
+        }
 
     }
 
@@ -76,112 +83,120 @@ public class ManagedObject {
     private String parent_relation;
     private List<Uri> children;
 
-       public String getSubject() {
-               return subject;
-       }
-       public void setSubject(String subject) {
-               this.subject = subject;
-       }
-       public Uri getUri() {
-               return uri;
-       }
-       public void setUri(Uri uri) {
-               this.uri = uri;
-       }
-       public List<Property> getProperties() {
-               return properties;
-       }
-       public void setProperties(List<Property> properties) {
-               this.properties = properties;
-       }
-       public String getParent_subject() {
-               return parent_subject;
-       }
-       public void setParent_subject(String parent_subject) {
-               this.parent_subject = parent_subject;
-       }
-       public Uri getParent_uri() {
-               return parent_uri;
-       }
-       public void setParent_uri(Uri parent_uri) {
-               this.parent_uri = parent_uri;
-       }
-       public String getParent_relation() {
-               return parent_relation;
-       }
-       public void setParent_relation(String parent_relation) {
-               this.parent_relation = parent_relation;
-       }
-       public List<Uri> getChildren() {
-               return children;
-       }
-       public void setChildren(List<Uri> children) {
-               this.children = children;
-       }
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public Uri getUri() {
+        return uri;
+    }
+
+    public void setUri(Uri uri) {
+        this.uri = uri;
+    }
+
+    public List<Property> getProperties() {
+        return properties;
+    }
+
+    public void setProperties(List<Property> properties) {
+        this.properties = properties;
+    }
+
+    public String getParent_subject() {
+        return parent_subject;
+    }
+
+    public void setParent_subject(String parent_subject) {
+        this.parent_subject = parent_subject;
+    }
+
+    public Uri getParent_uri() {
+        return parent_uri;
+    }
+
+    public void setParent_uri(Uri parent_uri) {
+        this.parent_uri = parent_uri;
+    }
+
+    public String getParent_relation() {
+        return parent_relation;
+    }
+
+    public void setParent_relation(String parent_relation) {
+        this.parent_relation = parent_relation;
+    }
+
+    public List<Uri> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<Uri> children) {
+        this.children = children;
+    }
 
     @Override
-       public int hashCode() {
-               final int prime = 31;
-               int result = 1;
-               result = prime * result
-                               + ((children == null) ? 0 : children.hashCode());
-               result = prime * result
-                               + ((parent_relation == null) ? 0 : parent_relation.hashCode());
-               result = prime * result
-                               + ((parent_subject == null) ? 0 : parent_subject.hashCode());
-               result = prime * result
-                               + ((parent_uri == null) ? 0 : parent_uri.hashCode());
-               result = prime * result
-                               + ((properties == null) ? 0 : properties.hashCode());
-               result = prime * result + ((subject == null) ? 0 : subject.hashCode());
-               result = prime * result + ((uri == null) ? 0 : uri.hashCode());
-               return result;
-       }
-
-       @Override
-       public boolean equals(Object obj) {
-               if (this == obj)
-                       return true;
-               if (obj == null)
-                       return false;
-               if (getClass() != obj.getClass())
-                       return false;
-               ManagedObject other = (ManagedObject) obj;
-               if (children == null) {
-                       if (other.children != null)
-                               return false;
-               } else if (!children.equals(other.children))
-                       return false;
-               if (parent_relation == null) {
-                       if (other.parent_relation != null)
-                               return false;
-               } else if (!parent_relation.equals(other.parent_relation))
-                       return false;
-               if (parent_subject == null) {
-                       if (other.parent_subject != null)
-                               return false;
-               } else if (!parent_subject.equals(other.parent_subject))
-                       return false;
-               if (parent_uri == null) {
-                       if (other.parent_uri != null)
-                               return false;
-               } else if (!parent_uri.equals(other.parent_uri))
-                       return false;
-               if (properties == null) {
-                       if (other.properties != null)
-                               return false;
-               } else if (!properties.equals(other.properties))
-                       return false;
-               if (subject == null) {
-                       if (other.subject != null)
-                               return false;
-               } else if (!subject.equals(other.subject))
-                       return false;
-               if (uri == null) {
-                       if (other.uri != null)
-                               return false;
-               } else if (!uri.equals(other.uri))
-                       return false;
-               return true;
-       }
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((children == null) ? 0 : children.hashCode());
+        result = prime * result + ((parent_relation == null) ? 0 : parent_relation.hashCode());
+        result = prime * result + ((parent_subject == null) ? 0 : parent_subject.hashCode());
+        result = prime * result + ((parent_uri == null) ? 0 : parent_uri.hashCode());
+        result = prime * result + ((properties == null) ? 0 : properties.hashCode());
+        result = prime * result + ((subject == null) ? 0 : subject.hashCode());
+        result = prime * result + ((uri == null) ? 0 : uri.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        ManagedObject other = (ManagedObject) obj;
+        if (children == null) {
+            if (other.children != null)
+                return false;
+        } else if (!children.equals(other.children))
+            return false;
+        if (parent_relation == null) {
+            if (other.parent_relation != null)
+                return false;
+        } else if (!parent_relation.equals(other.parent_relation))
+            return false;
+        if (parent_subject == null) {
+            if (other.parent_subject != null)
+                return false;
+        } else if (!parent_subject.equals(other.parent_subject))
+            return false;
+        if (parent_uri == null) {
+            if (other.parent_uri != null)
+                return false;
+        } else if (!parent_uri.equals(other.parent_uri))
+            return false;
+        if (properties == null) {
+            if (other.properties != null)
+                return false;
+        } else if (!properties.equals(other.properties))
+            return false;
+        if (subject == null) {
+            if (other.subject != null)
+                return false;
+        } else if (!subject.equals(other.subject))
+            return false;
+        if (uri == null) {
+            if (other.uri != null)
+                return false;
+        } else if (!uri.equals(other.uri))
+            return false;
+        return true;
+    }
 }
index 365a5a79fbc3f1452edfa5f5f6b37876a479581d..a0b3404416fc3cab0a5777c8eeaf8e4e90b350f5 100644 (file)
@@ -1,61 +1,65 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
 
 public class OpflexError {
 
-       public static enum ErrorCode {
-               ERROR("ERROR"),
-               EUNSUPPORTED("EUNSUPPORTED"),
-               ESTATE("ESTATE"),
-               EPROTO("EPROTO"),
-               EDOMAIN("EDOMAIN");
-
-               private String errorCode;
-
-               ErrorCode(String errorCode) {
-                       this.errorCode = errorCode;
-               }
-
-               @Override
-               public String toString() {
-                       return this.errorCode;
-               }
-       }
-
-       private String code;
-       private String message;
-       private String trace;
-       private String data;
-       public String getCode() {
-               return code;
-       }
-       public void setCode(String code) {
-               this.code = code;
-       }
-       public String getMessage() {
-               return message;
-       }
-       public void setMessage(String message) {
-               this.message = message;
-       }
-       public String getTrace() {
-               return trace;
-       }
-       public void setTrace(String trace) {
-               this.trace = trace;
-       }
-       public String getData() {
-               return data;
-       }
-       public void setData(String data) {
-               this.data = data;
-       }
+    public static enum ErrorCode {
+        ERROR("ERROR"), EUNSUPPORTED("EUNSUPPORTED"), ESTATE("ESTATE"), EPROTO("EPROTO"), EDOMAIN("EDOMAIN");
+
+        private String errorCode;
+
+        ErrorCode(String errorCode) {
+            this.errorCode = errorCode;
+        }
+
+        @Override
+        public String toString() {
+            return this.errorCode;
+        }
+    }
+
+    private String code;
+    private String message;
+    private String trace;
+    private String data;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getTrace() {
+        return trace;
+    }
+
+    public void setTrace(String trace) {
+        this.trace = trace;
+    }
+
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
 }
index 98d53ac0b196e20b9a672885201189ac05bc140a..61801e10e02a848dbe400dbb40b91db3e1e56ffb 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -12,20 +12,24 @@ package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri;
 
 public class PolicyIdentity {
-       private String name;
-       private Uri context;
-       
-       public String getName() {
-               return name;
-       }
-       public void setName(String name) {
-               this.name = name;
-       }
-       public Uri getContext() {
-               return context;
-       }
-       public void setContext(Uri context) {
-               this.context = context;
-       }
+
+    private String name;
+    private Uri context;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Uri getContext() {
+        return context;
+    }
+
+    public void setContext(Uri context) {
+        this.context = context;
+    }
 
 }
index 886483792096cc572b984fdb8ce12a86503f79af..788e5bf5bb6afc10f59ae18174fb40f8d91ea0f7 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -26,6 +26,7 @@ public class PolicyResolveRequest extends RpcMessage {
     public static final String RESOLVE_MESSAGE = "policy_resolve";
 
     static public class Params {
+
         private String subject;
         private Uri policy_uri;
         private PolicyIdentity policy_ident;
@@ -35,30 +36,39 @@ public class PolicyResolveRequest extends RpcMessage {
         public String getSubject() {
             return subject;
         }
+
         public void setSubject(String subject) {
             this.subject = subject;
         }
+
         public Uri getPolicy_uri() {
             return policy_uri;
         }
+
         public void setPolicy_uri(Uri policy_uri) {
             this.policy_uri = policy_uri;
         }
+
         public PolicyIdentity getPolicy_ident() {
             return policy_ident;
         }
+
         public void setPolicy_ident(PolicyIdentity policy_ident) {
             this.policy_ident = policy_ident;
         }
+
         public String getData() {
             return data;
         }
+
         public void setData(String data) {
             this.data = data;
         }
+
         public int getPrr() {
             return prr;
         }
+
         public void setPrr(int prr) {
             this.prr = prr;
         }
@@ -120,6 +130,7 @@ public class PolicyResolveRequest extends RpcMessage {
 
     /**
      * Minimal check on validity of message
+     * 
      * @return true if message has passed validity check
      */
     @JsonIgnore
index 6e01a0cdf94b10ee8e8521d72beab82f181d3c6f..24414fd3d36247c0b753af22be820176e3382445 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -25,10 +25,13 @@ public class PolicyResolveResponse extends RpcMessage {
     public static final String POLICY_MESSAGE_RESPONSE = "policy_resolve_response";
 
     static public class Result {
+
         private List<ManagedObject> policy;
+
         public List<ManagedObject> getPolicy() {
             return policy;
         }
+
         public void setPolicy(List<ManagedObject> policy) {
             this.policy = policy;
         }
@@ -67,8 +70,7 @@ public class PolicyResolveResponse extends RpcMessage {
     }
 
     @Override
-    public void setMethod(String method) {
-    }
+    public void setMethod(String method) {}
 
     public Result getResult() {
         return this.result;
@@ -102,5 +104,4 @@ public class PolicyResolveResponse extends RpcMessage {
         return true;
     }
 
-
 }
index 12f1b9bd387aaea1a37076915fd716def4f155b6..e74ec0dac473e12ef26f4fbdba3de5ddcc740807 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -26,28 +26,36 @@ public class PolicyUnresolveRequest extends RpcMessage {
     public static final String UNRESOLVE_MESSAGE = "policy_unresolve";
 
     static public class Params {
+
         private String subject;
         private Uri policy_uri;
         private PolicyIdentity policy_ident;
+
         public String getSubject() {
             return subject;
         }
+
         public void setSubject(String subject) {
             this.subject = subject;
         }
+
         public Uri getPolicy_uri() {
             return policy_uri;
         }
+
         public void setPolicy_uri(Uri policy_uri) {
             this.policy_uri = policy_uri;
         }
+
         public PolicyIdentity getPolicy_ident() {
             return policy_ident;
         }
+
         public void setPolicy_ident(PolicyIdentity policy_ident) {
             this.policy_ident = policy_ident;
         }
     }
+
     private JsonNode id;
     private String method;
     private List<Params> params;
@@ -104,6 +112,7 @@ public class PolicyUnresolveRequest extends RpcMessage {
 
     /**
      * Minimal check on validity of message
+     * 
      * @return true if message has passed validity check
      */
     @JsonIgnore
index 498ad76f795ff558655fbbf51ed799739f80e5a1..4d5884bb34d8bddb5f3aee275e11287560a28570 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -58,8 +58,7 @@ public class PolicyUnresolveResponse extends RpcMessage {
     }
 
     @Override
-    public void setMethod(String method) {
-    }
+    public void setMethod(String method) {}
 
     public Result getResult() {
         return this.result;
@@ -93,5 +92,4 @@ public class PolicyUnresolveResponse extends RpcMessage {
         return true;
     }
 
-
 }
index c71c1914dcb8e92b3d2f0ffb25182e0042e93eb1..b6379335783b9a42ba76492f785fb84263e4c799 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -26,28 +26,36 @@ public class PolicyUpdateRequest extends RpcMessage {
     public static final String UPDATE_MESSAGE = "policy_update";
 
     static public class Params {
+
         private List<ManagedObject> replace;
         private List<ManagedObject> merge_children;
         private List<Uri> delete_uri;
+
         public List<ManagedObject> getReplace() {
             return replace;
         }
+
         public void setReplace(List<ManagedObject> replace) {
             this.replace = replace;
         }
+
         public List<ManagedObject> getMerge_children() {
             return merge_children;
         }
+
         public void setMerge_children(List<ManagedObject> merge_children) {
             this.merge_children = merge_children;
         }
+
         public List<Uri> getDelete_uri() {
             return delete_uri;
         }
+
         public void setDelete_uri(List<Uri> delete_uri) {
             this.delete_uri = delete_uri;
         }
     }
+
     private JsonNode id;
     private String method;
     private List<Params> params;
@@ -104,6 +112,7 @@ public class PolicyUpdateRequest extends RpcMessage {
 
     /**
      * Minimal check on validity of message
+     * 
      * @return true if message has passed validity check
      */
     @JsonIgnore
index 2b76a40f4880351281e212e3db14f1ff97e2a267..2ac413c28b746a6366d4ee544a3f0d7ad6dd6449 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -58,8 +58,7 @@ public class PolicyUpdateResponse extends RpcMessage {
     }
 
     @Override
-    public void setMethod(String method) {
-    }
+    public void setMethod(String method) {}
 
     public Result getResult() {
         return this.result;
@@ -93,5 +92,4 @@ public class PolicyUpdateResponse extends RpcMessage {
         return true;
     }
 
-
 }
index a802680c694b39fac67a561a0e4f35d167b5de71..4a6c0957546e1c1b2a3ce54b32aad5365be06c01 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -26,21 +26,27 @@ public class StateReportRequest extends RpcMessage {
     public static final String STATE_MESSAGE = "report_state";
 
     static public class Params {
+
         private Uri object;
         private List<ManagedObject> observable;
+
         public Uri getObject() {
             return object;
         }
+
         public void setObject(Uri object) {
             this.object = object;
         }
+
         public List<ManagedObject> getObservable() {
             return observable;
         }
+
         public void setObservable(List<ManagedObject> observable) {
             this.observable = observable;
         }
     }
+
     private JsonNode id;
     private String method;
     private List<Params> params;
@@ -97,6 +103,7 @@ public class StateReportRequest extends RpcMessage {
 
     /**
      * Minimal check on validity of message
+     * 
      * @return true if message has passed validity check
      */
     @JsonIgnore
index 3271bc22896d1d60290dccfacb5c4a02df03f72a..bc68c7de346b4c8bc82d39df191ed50e463d96f4 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 package org.opendaylight.groupbasedpolicy.renderer.opflex.lib.messages;
@@ -58,8 +58,7 @@ public class StateReportResponse extends RpcMessage {
     }
 
     @Override
-    public void setMethod(String method) {
-    }
+    public void setMethod(String method) {}
 
     public Result getResult() {
         return this.result;
@@ -93,5 +92,4 @@ public class StateReportResponse extends RpcMessage {
         return true;
     }
 
-
 }
index a3902d25e02c3e5047c037ad7d9f37184a0049ec..3560f5f78a0deb9d30fcac60650e7a398074fae2 100644 (file)
@@ -1,16 +1,15 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 
 package org.opendaylight.groupbasedpolicy.renderer.opflex.mit;
 
-
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -28,110 +27,108 @@ import org.opendaylight.groupbasedpolicy.renderer.opflex.mit.PolicyPropertyInfo.
  * reference design for Open vSwitch.
  *
  * @author tbachman
- *
  */
 public class AgentOvsMit implements OpflexMit {
 
-       private Map<String,PolicyClassInfo> metaDataMap = null;
-       private Map<Long, String> classIdToStringMap = null;
-
-       public AgentOvsMit() {
-               Map<String,PolicyClassInfo> metaData = new HashMap<String, PolicyClassInfo>();
-               Map<Long, String> classIdToString = new HashMap<Long, String>();
+    private Map<String, PolicyClassInfo> metaDataMap = null;
+    private Map<Long, String> classIdToStringMap = null;
 
-               /*
-                * Construct the MIT
-                */
-               EnumInfo ei;
-               PolicyPropertyInfo ppi;
-               PolicyClassInfo pci;
-               EnumInfoBuilder eib;
-               PolicyPropertyInfoBuilder ppib;
-               PolicyClassInfoBuilder pcib;
-               List<PolicyPropertyInfo> ppil;
-               List<PolicyPropertyId> classKeys;
+    public AgentOvsMit() {
+        Map<String, PolicyClassInfo> metaData = new HashMap<String, PolicyClassInfo>();
+        Map<Long, String> classIdToString = new HashMap<Long, String>();
 
+        /*
+         * Construct the MIT
+         */
+        EnumInfo ei;
+        PolicyPropertyInfo ppi;
+        PolicyClassInfo pci;
+        EnumInfoBuilder eib;
+        PolicyPropertyInfoBuilder ppib;
+        PolicyClassInfoBuilder pcib;
+        List<PolicyPropertyInfo> ppil;
+        List<PolicyPropertyId> classKeys;
 
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147516423l)).
-             setPropName("RelatorUniverse").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(7l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147516423l))
+            .setPropName("RelatorUniverse")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(7l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147516436l)).
-             setPropName("GbpeTunnelEpUniverse").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(20l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147516436l))
+            .setPropName("GbpeTunnelEpUniverse")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(20l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147516439l)).
-             setPropName("DomainConfig").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(23l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147516439l))
+            .setPropName("DomainConfig")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(23l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147516467l)).
-             setPropName("EpdrL2Discovered").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(51l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147516467l))
+            .setPropName("EpdrL2Discovered")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(51l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147516468l)).
-             setPropName("EpdrL3Discovered").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(52l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147516468l))
+            .setPropName("EpdrL3Discovered")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(52l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147516471l)).
-             setPropName("EprL2Universe").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(55l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147516471l))
+            .setPropName("EprL2Universe")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(55l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147516474l)).
-             setPropName("EprL3Universe").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(58l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147516474l))
+            .setPropName("EprL3Universe")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(58l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147516518l)).
-             setPropName("ObserverEpStatUniverse").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(102l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147516518l))
+            .setPropName("ObserverEpStatUniverse")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(102l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147516531l)).
-             setPropName("PolicyUniverse").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(115l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147516531l))
+            .setPropName("PolicyUniverse")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(115l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(1).
-             setClassName("DmtreeRoot").
-             setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(1)
+            .setClassName("DmtreeRoot")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -139,107 +136,107 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147713057l)).
-             setPropName("DomainConfigToConfigRRes").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(33l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147713057l))
+            .setPropName("DomainConfigToConfigRRes")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(33l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147713058l)).
-             setPropName("GbpeEpgMappingCtxToEpgMappingRRes").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(34l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147713058l))
+            .setPropName("GbpeEpgMappingCtxToEpgMappingRRes")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(34l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147713070l)).
-             setPropName("SpanLocalEpToEpRRes").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(46l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147713070l))
+            .setPropName("SpanLocalEpToEpRRes")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(46l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147713083l)).
-             setPropName("SpanMemberToRefRRes").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(59l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147713083l))
+            .setPropName("SpanMemberToRefRRes")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(59l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147713093l)).
-             setPropName("GbpRuleToClassifierRRes").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(69l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147713093l))
+            .setPropName("GbpRuleToClassifierRRes")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(69l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147713094l)).
-             setPropName("EpdrEndPointToGroupRRes").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(70l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147713094l))
+            .setPropName("EpdrEndPointToGroupRRes")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(70l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147713105l)).
-             setPropName("GbpSubnetsToNetworkRRes").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(81l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147713105l))
+            .setPropName("GbpSubnetsToNetworkRRes")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(81l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147713108l)).
-             setPropName("GbpEpGroupToNetworkRRes").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(84l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147713108l))
+            .setPropName("GbpEpGroupToNetworkRRes")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(84l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147713113l)).
-             setPropName("GbpEpGroupToProvContractRRes").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(89l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147713113l))
+            .setPropName("GbpEpGroupToProvContractRRes")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(89l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147713116l)).
-             setPropName("GbpEpGroupToConsContractRRes").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(92l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147713116l))
+            .setPropName("GbpEpGroupToConsContractRRes")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(92l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147713120l)).
-             setPropName("GbpBridgeDomainToNetworkRRes").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(96l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147713120l))
+            .setPropName("GbpBridgeDomainToNetworkRRes")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(96l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147713124l)).
-             setPropName("GbpFloodDomainToNetworkRRes").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(100l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147713124l))
+            .setPropName("GbpFloodDomainToNetworkRRes")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(100l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(7).
-             setClassName("RelatorUniverse").
-             setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(7)
+            .setClassName("RelatorUniverse")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -248,134 +245,134 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("GbpeEncapTypeT");
-        eib.setEnumValue("unknown",new BigInteger(String.valueOf(0)));
-        eib.setEnumValue("vlan",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("vxlan",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("unknown", new BigInteger(String.valueOf(0)));
+        eib.setEnumValue("vlan", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("vxlan", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(294914l)).
-             setPropName("encapType").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(294914l))
+            .setPropName("encapType")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("PlatformSwitchingModeT");
-        eib.setEnumValue("hairpin",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("intra_bd",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("intra_epg",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("intra_rd",new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("hairpin", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("intra_bd", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("intra_epg", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("intra_rd", new BigInteger(String.valueOf(4)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(294915l)).
-             setPropName("mode").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(294915l))
+            .setPropName("mode")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(294916l)).
-             setPropName("multicastGroupIP").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(294916l))
+            .setPropName("multicastGroupIP")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(294913l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(294913l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147778571l)).
-             setPropName("CdpConfig").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(11l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147778571l))
+            .setPropName("CdpConfig")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(11l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147778575l)).
-             setPropName("DfwConfig").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(15l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147778575l))
+            .setPropName("DfwConfig")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(15l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147778582l)).
-             setPropName("L2Config").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(22l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147778582l))
+            .setPropName("L2Config")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(22l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147778584l)).
-             setPropName("LacpConfig").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(24l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147778584l))
+            .setPropName("LacpConfig")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(24l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147778585l)).
-             setPropName("LldpConfig").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(25l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147778585l))
+            .setPropName("LldpConfig")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(25l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147778586l)).
-             setPropName("StpConfig").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(26l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147778586l))
+            .setPropName("StpConfig")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(26l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147778592l)).
-             setPropName("DomainConfigFromConfigRTgt").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(32l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147778592l))
+            .setPropName("DomainConfigFromConfigRTgt")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(32l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147778601l)).
-             setPropName("SpanSrcGrp").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(41l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147778601l))
+            .setPropName("SpanSrcGrp")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(41l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147778602l)).
-             setPropName("SpanDstGrp").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(42l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147778602l))
+            .setPropName("SpanDstGrp")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(42l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147778603l)).
-             setPropName("SpanLocalEp").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(43l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147778603l))
+            .setPropName("SpanLocalEp")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(43l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(9).
-             setClassName("PlatformConfig").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(9)
+            .setClassName("PlatformConfig")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -383,34 +380,34 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(327682l)).
-             setPropName("defaultGroup").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(327682l))
+            .setPropName("defaultGroup")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(327681l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(327681l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147811359l)).
-             setPropName("GbpeEpgMappingCtxFromEpgMappingRTgt").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(31l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147811359l))
+            .setPropName("GbpeEpgMappingCtxFromEpgMappingRTgt")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(31l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(10).
-             setClassName("GbpeEpgMapping").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(10)
+            .setClassName("GbpeEpgMapping")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -418,31 +415,31 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(360449l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(360449l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("PlatformAdminStateT");
-        eib.setEnumValue("off",new BigInteger(String.valueOf(0)));
-        eib.setEnumValue("on",new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("off", new BigInteger(String.valueOf(0)));
+        eib.setEnumValue("on", new BigInteger(String.valueOf(1)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(360450l)).
-             setPropName("state").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(360450l))
+            .setPropName("state")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(11).
-             setClassName("CdpConfig").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(11)
+            .setClassName("CdpConfig")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -450,32 +447,32 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(393217l)).
-             setPropName("classid").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(393217l))
+            .setPropName("classid")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(393218l)).
-             setPropName("encapId").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(393218l))
+            .setPropName("encapId")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(393219l)).
-             setPropName("multicastGroupIP").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(393219l))
+            .setPropName("multicastGroupIP")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(12).
-             setClassName("GbpeInstContext").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(12)
+            .setClassName("GbpeInstContext")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -483,19 +480,19 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2147909659l)).
-             setPropName("GbpeEpgMappingCtxToEpgMappingRSrc").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(27l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2147909659l))
+            .setPropName("GbpeEpgMappingCtxToEpgMappingRSrc")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(27l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(13).
-             setClassName("GbpeEpgMappingCtx").
-             setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(13)
+            .setClassName("GbpeEpgMappingCtx")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -503,31 +500,31 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(491521l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(491521l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("PlatformAdminStateT");
-        eib.setEnumValue("off",new BigInteger(String.valueOf(0)));
-        eib.setEnumValue("on",new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("off", new BigInteger(String.valueOf(0)));
+        eib.setEnumValue("on", new BigInteger(String.valueOf(1)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(491522l)).
-             setPropName("state").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(491522l))
+            .setPropName("state")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(15).
-             setClassName("DfwConfig").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(15)
+            .setClassName("DfwConfig")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -535,33 +532,33 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(524290l)).
-             setPropName("rxDrop").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(524290l))
+            .setPropName("rxDrop")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(524291l)).
-             setPropName("txDrop").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(524291l))
+            .setPropName("txDrop")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(524289l)).
-             setPropName("uuid").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(524289l))
+            .setPropName("uuid")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(16).
-             setClassName("DfwEpCounter").
-             setPolicyType(PolicyClassInfo.PolicyClassType.OBSERVABLE).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(16)
+            .setClassName("DfwEpCounter")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.OBSERVABLE)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -569,18 +566,18 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(557057l)).
-             setPropName("multicastGroupIP").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(557057l))
+            .setPropName("multicastGroupIP")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(17).
-             setClassName("GbpeFloodContext").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(17)
+            .setClassName("GbpeFloodContext")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -589,128 +586,128 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("ArpOpcodeT");
-        eib.setEnumValue("reply",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("request",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("unspecified",new BigInteger(String.valueOf(0)));
+        eib.setEnumValue("reply", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("request", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("unspecified", new BigInteger(String.valueOf(0)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(589829l)).
-             setPropName("arpOpc").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(589829l))
+            .setPropName("arpOpc")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("GbpConnTrackT");
-        eib.setEnumValue("normal",new BigInteger(String.valueOf(0)));
-        eib.setEnumValue("reflexive",new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("normal", new BigInteger(String.valueOf(0)));
+        eib.setEnumValue("reflexive", new BigInteger(String.valueOf(1)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(589827l)).
-             setPropName("connectionTracking").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(589827l))
+            .setPropName("connectionTracking")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(589834l)).
-             setPropName("dFromPort").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(589834l))
+            .setPropName("dFromPort")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(589835l)).
-             setPropName("dToPort").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(589835l))
+            .setPropName("dToPort")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("GbpDirectionT");
-        eib.setEnumValue("bidirectional",new BigInteger(String.valueOf(0)));
-        eib.setEnumValue("in",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("out",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("bidirectional", new BigInteger(String.valueOf(0)));
+        eib.setEnumValue("in", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("out", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(589828l)).
-             setPropName("direction").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(589828l))
+            .setPropName("direction")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("L2EtherTypeT");
-        eib.setEnumValue("arp",new BigInteger(String.valueOf(0x0806)));
-        eib.setEnumValue("fcoe",new BigInteger(String.valueOf(0x8906)));
-        eib.setEnumValue("ipv4",new BigInteger(String.valueOf(0x0800)));
-        eib.setEnumValue("ipv6",new BigInteger(String.valueOf(0x86DD)));
-        eib.setEnumValue("mac_security",new BigInteger(String.valueOf(0x88E5)));
-        eib.setEnumValue("mpls_ucast",new BigInteger(String.valueOf(0x8847)));
-        eib.setEnumValue("trill",new BigInteger(String.valueOf(0x22F3)));
-        eib.setEnumValue("unspecified",new BigInteger(String.valueOf(0)));
+        eib.setEnumValue("arp", new BigInteger(String.valueOf(0x0806)));
+        eib.setEnumValue("fcoe", new BigInteger(String.valueOf(0x8906)));
+        eib.setEnumValue("ipv4", new BigInteger(String.valueOf(0x0800)));
+        eib.setEnumValue("ipv6", new BigInteger(String.valueOf(0x86DD)));
+        eib.setEnumValue("mac_security", new BigInteger(String.valueOf(0x88E5)));
+        eib.setEnumValue("mpls_ucast", new BigInteger(String.valueOf(0x8847)));
+        eib.setEnumValue("trill", new BigInteger(String.valueOf(0x22F3)));
+        eib.setEnumValue("unspecified", new BigInteger(String.valueOf(0)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(589830l)).
-             setPropName("etherT").
-             setType(PolicyPropertyInfo.PropertyType.ENUM16).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(589830l))
+            .setPropName("etherT")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM16)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(589825l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(589825l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(589826l)).
-             setPropName("order").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(589826l))
+            .setPropName("order")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(589831l)).
-             setPropName("prot").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(589831l))
+            .setPropName("prot")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(589832l)).
-             setPropName("sFromPort").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(589832l))
+            .setPropName("sFromPort")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(589833l)).
-             setPropName("sToPort").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(589833l))
+            .setPropName("sToPort")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2148073540l)).
-             setPropName("GbpRuleFromClassifierRTgt").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(68l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2148073540l))
+            .setPropName("GbpRuleFromClassifierRTgt")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(68l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(18).
-             setClassName("GbpeL24Classifier").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(18)
+            .setClassName("GbpeL24Classifier")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -718,103 +715,103 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(622600l)).
-             setPropName("rxBroadcast").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(622600l))
+            .setPropName("rxBroadcast")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(622604l)).
-             setPropName("rxBytes").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(622604l))
+            .setPropName("rxBytes")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(622596l)).
-             setPropName("rxDrop").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(622596l))
+            .setPropName("rxDrop")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(622598l)).
-             setPropName("rxMulticast").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(622598l))
+            .setPropName("rxMulticast")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(622594l)).
-             setPropName("rxPackets").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(622594l))
+            .setPropName("rxPackets")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(622602l)).
-             setPropName("rxUnicast").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(622602l))
+            .setPropName("rxUnicast")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(622601l)).
-             setPropName("txBroadcast").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(622601l))
+            .setPropName("txBroadcast")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(622605l)).
-             setPropName("txBytes").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(622605l))
+            .setPropName("txBytes")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(622597l)).
-             setPropName("txDrop").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(622597l))
+            .setPropName("txDrop")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(622599l)).
-             setPropName("txMulticast").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(622599l))
+            .setPropName("txMulticast")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(622595l)).
-             setPropName("txPackets").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(622595l))
+            .setPropName("txPackets")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(622603l)).
-             setPropName("txUnicast").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(622603l))
+            .setPropName("txUnicast")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(622593l)).
-             setPropName("uuid").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(622593l))
+            .setPropName("uuid")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(19).
-             setClassName("GbpeEpCounter").
-             setPolicyType(PolicyClassInfo.PolicyClassType.OBSERVABLE).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(19)
+            .setClassName("GbpeEpCounter")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.OBSERVABLE)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -822,19 +819,19 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2148139029l)).
-             setPropName("GbpeTunnelEp").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(21l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2148139029l))
+            .setPropName("GbpeTunnelEp")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(21l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(20).
-             setClassName("GbpeTunnelEpUniverse").
-             setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(20)
+            .setClassName("GbpeTunnelEpUniverse")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -842,54 +839,54 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(688133l)).
-             setPropName("encapId").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(688133l))
+            .setPropName("encapId")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("GbpeEncapTypeT");
-        eib.setEnumValue("unknown",new BigInteger(String.valueOf(0)));
-        eib.setEnumValue("vlan",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("vxlan",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("unknown", new BigInteger(String.valueOf(0)));
+        eib.setEnumValue("vlan", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("vxlan", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(688132l)).
-             setPropName("encapType").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(688132l))
+            .setPropName("encapType")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(688131l)).
-             setPropName("mac").
-             setType(PolicyPropertyInfo.PropertyType.MAC).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(688131l))
+            .setPropName("mac")
+            .setType(PolicyPropertyInfo.PropertyType.MAC)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(688130l)).
-             setPropName("terminatorIp").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(688130l))
+            .setPropName("terminatorIp")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(688129l)).
-             setPropName("uuid").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(688129l))
+            .setPropName("uuid")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(21).
-             setClassName("GbpeTunnelEp").
-             setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ENDPOINT).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(21)
+            .setClassName("GbpeTunnelEp")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ENDPOINT)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -897,25 +894,25 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(720897l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(720897l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(720898l)).
-             setPropName("state").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(720898l))
+            .setPropName("state")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(22).
-             setClassName("L2Config").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(22)
+            .setClassName("L2Config")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -923,19 +920,19 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2148237340l)).
-             setPropName("DomainConfigToConfigRSrc").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(28l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2148237340l))
+            .setPropName("DomainConfigToConfigRSrc")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(28l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(23).
-             setClassName("DomainConfig").
-             setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(23)
+            .setClassName("DomainConfig")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -944,61 +941,61 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("LacpControlBitsT");
-        eib.setEnumValue("fast-select-hot-standby",new BigInteger(String.valueOf(8)));
-        eib.setEnumValue("graceful-convergence",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("load-defer",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("suspend-invididual-port",new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("fast-select-hot-standby", new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("graceful-convergence", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("load-defer", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("suspend-invididual-port", new BigInteger(String.valueOf(1)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(786437l)).
-             setPropName("controlBits").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(786437l))
+            .setPropName("controlBits")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(786435l)).
-             setPropName("maxLinks").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(786435l))
+            .setPropName("maxLinks")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(786434l)).
-             setPropName("minLinks").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(786434l))
+            .setPropName("minLinks")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("LacpModeT");
-        eib.setEnumValue("active",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("mac-pin",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("off",new BigInteger(String.valueOf(0)));
-        eib.setEnumValue("passive",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("active", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("mac-pin", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("off", new BigInteger(String.valueOf(0)));
+        eib.setEnumValue("passive", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(786436l)).
-             setPropName("mode").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(786436l))
+            .setPropName("mode")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(786433l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(786433l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(24).
-             setClassName("LacpConfig").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(24)
+            .setClassName("LacpConfig")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1006,44 +1003,44 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(819201l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(819201l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("PlatformAdminStateT");
-        eib.setEnumValue("off",new BigInteger(String.valueOf(0)));
-        eib.setEnumValue("on",new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("off", new BigInteger(String.valueOf(0)));
+        eib.setEnumValue("on", new BigInteger(String.valueOf(1)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(819202l)).
-             setPropName("rx").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(819202l))
+            .setPropName("rx")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("PlatformAdminStateT");
-        eib.setEnumValue("off",new BigInteger(String.valueOf(0)));
-        eib.setEnumValue("on",new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("off", new BigInteger(String.valueOf(0)));
+        eib.setEnumValue("on", new BigInteger(String.valueOf(1)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(819203l)).
-             setPropName("tx").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(819203l))
+            .setPropName("tx")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(25).
-             setClassName("LldpConfig").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(25)
+            .setClassName("LldpConfig")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1052,43 +1049,43 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("PlatformAdminStateT");
-        eib.setEnumValue("off",new BigInteger(String.valueOf(0)));
-        eib.setEnumValue("on",new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("off", new BigInteger(String.valueOf(0)));
+        eib.setEnumValue("on", new BigInteger(String.valueOf(1)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(851971l)).
-             setPropName("bpduFilter").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(851971l))
+            .setPropName("bpduFilter")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("PlatformAdminStateT");
-        eib.setEnumValue("off",new BigInteger(String.valueOf(0)));
-        eib.setEnumValue("on",new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("off", new BigInteger(String.valueOf(0)));
+        eib.setEnumValue("on", new BigInteger(String.valueOf(1)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(851970l)).
-             setPropName("bpduGuard").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(851970l))
+            .setPropName("bpduGuard")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(851969l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(851969l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(26).
-             setClassName("StpConfig").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(26)
+            .setClassName("StpConfig")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1096,18 +1093,18 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(884739l)).
-             setPropName("target").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(884739l))
+            .setPropName("target")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(27).
-             setClassName("GbpeEpgMappingCtxToEpgMappingRSrc").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(27)
+            .setClassName("GbpeEpgMappingCtxToEpgMappingRSrc")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1115,18 +1112,18 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(917507l)).
-             setPropName("target").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(917507l))
+            .setPropName("target")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(28).
-             setClassName("DomainConfigToConfigRSrc").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(28)
+            .setClassName("DomainConfigToConfigRSrc")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1135,48 +1132,48 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1015810l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1015810l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1015811l)).
-             setPropName("source").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1015811l))
+            .setPropName("source")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1015809l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1015809l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(31).
-             setClassName("GbpeEpgMappingCtxFromEpgMappingRTgt").
-             setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(31)
+            .setClassName("GbpeEpgMappingCtxFromEpgMappingRTgt")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1185,48 +1182,48 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1048578l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1048578l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1048579l)).
-             setPropName("source").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1048579l))
+            .setPropName("source")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1048577l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1048577l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(32).
-             setClassName("DomainConfigFromConfigRTgt").
-             setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(32)
+            .setClassName("DomainConfigFromConfigRTgt")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1235,40 +1232,40 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1081346l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1081346l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1081345l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1081345l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(33).
-             setClassName("DomainConfigToConfigRRes").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(33)
+            .setClassName("DomainConfigToConfigRRes")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1277,40 +1274,40 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1114114l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1114114l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1114113l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1114113l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(34).
-             setClassName("GbpeEpgMappingCtxToEpgMappingRRes").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(34)
+            .setClassName("GbpeEpgMappingCtxToEpgMappingRRes")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1318,57 +1315,57 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1245188l)).
-             setPropName("context").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1245188l))
+            .setPropName("context")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1245187l)).
-             setPropName("group").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1245187l))
+            .setPropName("group")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1245186l)).
-             setPropName("mac").
-             setType(PolicyPropertyInfo.PropertyType.MAC).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1245186l))
+            .setPropName("mac")
+            .setType(PolicyPropertyInfo.PropertyType.MAC)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1245185l)).
-             setPropName("uuid").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1245185l))
+            .setPropName("uuid")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2148728871l)).
-             setPropName("EprL3Net").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(39l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2148728871l))
+            .setPropName("EprL3Net")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(39l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2148728877l)).
-             setPropName("SpanLocalEpFromEpRTgt").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(45l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2148728877l))
+            .setPropName("SpanLocalEpFromEpRTgt")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(45l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(38).
-             setClassName("EprL2Ep").
-             setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ENDPOINT).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(38)
+            .setClassName("EprL2Ep")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ENDPOINT)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1376,19 +1373,19 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1277953l)).
-             setPropName("ip").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1277953l))
+            .setPropName("ip")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(39).
-             setClassName("EprL3Net").
-             setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ENDPOINT).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(39)
+            .setClassName("EprL3Net")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ENDPOINT)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1396,54 +1393,54 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1343491l)).
-             setPropName("label").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1343491l))
+            .setPropName("label")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1343489l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1343489l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("PlatformAdminStateT");
-        eib.setEnumValue("off",new BigInteger(String.valueOf(0)));
-        eib.setEnumValue("on",new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("off", new BigInteger(String.valueOf(0)));
+        eib.setEnumValue("on", new BigInteger(String.valueOf(1)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1343490l)).
-             setPropName("state").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1343490l))
+            .setPropName("state")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2148827196l)).
-             setPropName("SpanSrcMember").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(60l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2148827196l))
+            .setPropName("SpanSrcMember")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(60l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2148827197l)).
-             setPropName("SpanDstMember").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(61l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2148827197l))
+            .setPropName("SpanDstMember")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(61l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(41).
-             setClassName("SpanSrcGrp").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(41)
+            .setClassName("SpanSrcGrp")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1451,34 +1448,34 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1376257l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1376257l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2148859964l)).
-             setPropName("SpanSrcMember").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(60l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2148859964l))
+            .setPropName("SpanSrcMember")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(60l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2148859965l)).
-             setPropName("SpanDstMember").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(61l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2148859965l))
+            .setPropName("SpanDstMember")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(61l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(42).
-             setClassName("SpanDstGrp").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(42)
+            .setClassName("SpanDstGrp")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1486,41 +1483,41 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1409025l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1409025l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1409026l)).
-             setPropName("nic").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1409026l))
+            .setPropName("nic")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2148892716l)).
-             setPropName("SpanLocalEpToEpRSrc").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(44l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2148892716l))
+            .setPropName("SpanLocalEpToEpRSrc")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(44l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2148892722l)).
-             setPropName("SpanMemberFromRefRTgt").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(50l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2148892722l))
+            .setPropName("SpanMemberFromRefRTgt")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(50l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(43).
-             setClassName("SpanLocalEp").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(43)
+            .setClassName("SpanLocalEp")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1528,18 +1525,18 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1441795l)).
-             setPropName("target").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1441795l))
+            .setPropName("target")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(44).
-             setClassName("SpanLocalEpToEpRSrc").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(44)
+            .setClassName("SpanLocalEpToEpRSrc")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1548,48 +1545,48 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1474562l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1474562l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1474563l)).
-             setPropName("source").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1474563l))
+            .setPropName("source")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1474561l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1474561l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(45).
-             setClassName("SpanLocalEpFromEpRTgt").
-             setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(45)
+            .setClassName("SpanLocalEpFromEpRTgt")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1598,40 +1595,40 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1507330l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1507330l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1507329l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1507329l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(46).
-             setClassName("SpanLocalEpToEpRRes").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(46)
+            .setClassName("SpanLocalEpToEpRRes")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1639,56 +1636,56 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1540101l)).
-             setPropName("context").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1540101l))
+            .setPropName("context")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1540099l)).
-             setPropName("group").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1540099l))
+            .setPropName("group")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1540100l)).
-             setPropName("ip").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1540100l))
+            .setPropName("ip")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1540098l)).
-             setPropName("mac").
-             setType(PolicyPropertyInfo.PropertyType.MAC).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1540098l))
+            .setPropName("mac")
+            .setType(PolicyPropertyInfo.PropertyType.MAC)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1540097l)).
-             setPropName("uuid").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1540097l))
+            .setPropName("uuid")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149023789l)).
-             setPropName("SpanLocalEpFromEpRTgt").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(45l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149023789l))
+            .setPropName("SpanLocalEpFromEpRTgt")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(45l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(47).
-             setClassName("EprL3Ep").
-             setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ENDPOINT).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(47)
+            .setClassName("EprL3Ep")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ENDPOINT)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1696,18 +1693,18 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1605635l)).
-             setPropName("target").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1605635l))
+            .setPropName("target")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(49).
-             setClassName("SpanMemberToRefRSrc").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(49)
+            .setClassName("SpanMemberToRefRSrc")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1716,48 +1713,48 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1638402l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1638402l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1638403l)).
-             setPropName("source").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1638403l))
+            .setPropName("source")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1638401l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1638401l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(50).
-             setClassName("SpanMemberFromRefRTgt").
-             setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(50)
+            .setClassName("SpanMemberFromRefRTgt")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1765,19 +1762,19 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149154887l)).
-             setPropName("EpdrLocalL2Ep").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(71l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149154887l))
+            .setPropName("EpdrLocalL2Ep")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(71l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(51).
-             setClassName("EpdrL2Discovered").
-             setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(51)
+            .setClassName("EpdrL2Discovered")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1785,19 +1782,19 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149187656l)).
-             setPropName("EpdrLocalL3Ep").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(72l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149187656l))
+            .setPropName("EpdrLocalL3Ep")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(72l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(52).
-             setClassName("EpdrL3Discovered").
-             setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(52)
+            .setClassName("EpdrL3Discovered")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1805,19 +1802,19 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149285926l)).
-             setPropName("EprL2Ep").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(38l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149285926l))
+            .setPropName("EprL2Ep")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(38l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(55).
-             setClassName("EprL2Universe").
-             setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(55)
+            .setClassName("EprL2Universe")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1825,18 +1822,18 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1835011l)).
-             setPropName("target").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1835011l))
+            .setPropName("target")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(56).
-             setClassName("EpdrEndPointToGroupRSrc").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(56)
+            .setClassName("EpdrEndPointToGroupRSrc")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1845,48 +1842,48 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1867778l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1867778l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1867779l)).
-             setPropName("source").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1867779l))
+            .setPropName("source")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1867777l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1867777l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(57).
-             setClassName("EpdrEndPointFromGroupRTgt").
-             setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(57)
+            .setClassName("EpdrEndPointFromGroupRTgt")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1894,19 +1891,19 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149384239l)).
-             setPropName("EprL3Ep").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(47l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149384239l))
+            .setPropName("EprL3Ep")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(47l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(58).
-             setClassName("EprL3Universe").
-             setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(58)
+            .setClassName("EprL3Universe")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1915,40 +1912,40 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1933314l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1933314l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1933313l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1933313l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(59).
-             setClassName("SpanMemberToRefRRes").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(59)
+            .setClassName("SpanMemberToRefRRes")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1957,40 +1954,40 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("SpanDirectionT");
-        eib.setEnumValue("both",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("in",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("out",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("both", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("in", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("out", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1966082l)).
-             setPropName("dir").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1966082l))
+            .setPropName("dir")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1966081l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1966081l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149449777l)).
-             setPropName("SpanMemberToRefRSrc").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(49l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149449777l))
+            .setPropName("SpanMemberToRefRSrc")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(49l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(60).
-             setClassName("SpanSrcMember").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(60)
+            .setClassName("SpanSrcMember")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -1998,35 +1995,35 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(1998849l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(1998849l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149482545l)).
-             setPropName("SpanMemberToRefRSrc").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(49l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149482545l))
+            .setPropName("SpanMemberToRefRSrc")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(49l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149482558l)).
-             setPropName("SpanDstSummary").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(62l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149482558l))
+            .setPropName("SpanDstSummary")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(62l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(61).
-             setClassName("SpanDstMember").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(61)
+            .setClassName("SpanDstMember")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2034,86 +2031,86 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2031617l)).
-             setPropName("dest").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2031617l))
+            .setPropName("dest")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2031624l)).
-             setPropName("dscp").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2031624l))
+            .setPropName("dscp")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2031620l)).
-             setPropName("flowId").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2031620l))
+            .setPropName("flowId")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("SpanErspanDestModeT");
-        eib.setEnumValue("notVisible",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("visible",new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("notVisible", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("visible", new BigInteger(String.valueOf(1)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2031625l)).
-             setPropName("mode").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2031625l))
+            .setPropName("mode")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2031623l)).
-             setPropName("mtu").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2031623l))
+            .setPropName("mtu")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2031618l)).
-             setPropName("srcPrefix").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2031618l))
+            .setPropName("srcPrefix")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2031621l)).
-             setPropName("ttl").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2031621l))
+            .setPropName("ttl")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("SpanErspanVersionT");
-        eib.setEnumValue("v1",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("v2",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("v1", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("v2", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2031619l)).
-             setPropName("version").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2031619l))
+            .setPropName("version")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2031622l)).
-             setPropName("vrfName").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2031622l))
+            .setPropName("vrfName")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(62).
-             setClassName("SpanDstSummary").
-             setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(62)
+            .setClassName("SpanDstSummary")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2121,43 +2118,43 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2097153l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2097153l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149580865l)).
-             setPropName("GbpSubject").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(65l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149580865l))
+            .setPropName("GbpSubject")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(65l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149580886l)).
-             setPropName("GbpEpGroupFromProvContractRTgt").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(86l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149580886l))
+            .setPropName("GbpEpGroupFromProvContractRTgt")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(86l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149580891l)).
-             setPropName("GbpEpGroupFromConsContractRTgt").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(91l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149580891l))
+            .setPropName("GbpEpGroupFromConsContractRTgt")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(91l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(64).
-             setClassName("GbpContract").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(64)
+            .setClassName("GbpContract")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2165,27 +2162,27 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2129921l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2129921l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149613634l)).
-             setPropName("GbpRule").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(66l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149613634l))
+            .setPropName("GbpRule")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(66l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(65).
-             setClassName("GbpSubject").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(65)
+            .setClassName("GbpSubject")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2193,34 +2190,34 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2162689l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2162689l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2162690l)).
-             setPropName("order").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2162690l))
+            .setPropName("order")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149646403l)).
-             setPropName("GbpRuleToClassifierRSrc").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(67l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149646403l))
+            .setPropName("GbpRuleToClassifierRSrc")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(67l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(66).
-             setClassName("GbpRule").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(66)
+            .setClassName("GbpRule")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2228,19 +2225,19 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2195459l)).
-             setPropName("target").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2195459l))
+            .setPropName("target")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(67).
-             setClassName("GbpRuleToClassifierRSrc").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(67)
+            .setClassName("GbpRuleToClassifierRSrc")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2249,48 +2246,48 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2228226l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2228226l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2228227l)).
-             setPropName("source").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2228227l))
+            .setPropName("source")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2228225l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2228225l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(68).
-             setClassName("GbpRuleFromClassifierRTgt").
-             setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(68)
+            .setClassName("GbpRuleFromClassifierRTgt")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2299,40 +2296,40 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2260994l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2260994l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2260993l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2260993l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(69).
-             setClassName("GbpRuleToClassifierRRes").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(69)
+            .setClassName("GbpRuleToClassifierRRes")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2341,40 +2338,40 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2293762l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2293762l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2293761l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2293761l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(70).
-             setClassName("EpdrEndPointToGroupRRes").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(70)
+            .setClassName("EpdrEndPointToGroupRRes")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2382,42 +2379,42 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2326530l)).
-             setPropName("mac").
-             setType(PolicyPropertyInfo.PropertyType.MAC).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2326530l))
+            .setPropName("mac")
+            .setType(PolicyPropertyInfo.PropertyType.MAC)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2326529l)).
-             setPropName("uuid").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2326529l))
+            .setPropName("uuid")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149810189l)).
-             setPropName("GbpeEpgMappingCtx").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(13l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149810189l))
+            .setPropName("GbpeEpgMappingCtx")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(13l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149810232l)).
-             setPropName("EpdrEndPointToGroupRSrc").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(56l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149810232l))
+            .setPropName("EpdrEndPointToGroupRSrc")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(56l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(71).
-             setClassName("EpdrLocalL2Ep").
-             setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(71)
+            .setClassName("EpdrLocalL2Ep")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2425,49 +2422,49 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2359299l)).
-             setPropName("ip").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2359299l))
+            .setPropName("ip")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2359298l)).
-             setPropName("mac").
-             setType(PolicyPropertyInfo.PropertyType.MAC).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2359298l))
+            .setPropName("mac")
+            .setType(PolicyPropertyInfo.PropertyType.MAC)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2359297l)).
-             setPropName("uuid").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2359297l))
+            .setPropName("uuid")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149842957l)).
-             setPropName("GbpeEpgMappingCtx").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(13l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149842957l))
+            .setPropName("GbpeEpgMappingCtx")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(13l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149843000l)).
-             setPropName("EpdrEndPointToGroupRSrc").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(56l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149843000l))
+            .setPropName("EpdrEndPointToGroupRSrc")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(56l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(72).
-             setClassName("EpdrLocalL3Ep").
-             setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(72)
+            .setClassName("EpdrLocalL3Ep")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2475,58 +2472,58 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2424834l)).
-             setPropName("ipv6Autoconfig").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2424834l))
+            .setPropName("ipv6Autoconfig")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2424833l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2424833l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149908492l)).
-             setPropName("GbpeInstContext").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(12l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149908492l))
+            .setPropName("GbpeInstContext")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(12l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149908560l)).
-             setPropName("GbpSubnetsFromNetworkRTgt").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(80l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149908560l))
+            .setPropName("GbpSubnetsFromNetworkRTgt")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(80l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149908563l)).
-             setPropName("GbpEpGroupFromNetworkRTgt").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(83l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149908563l))
+            .setPropName("GbpEpGroupFromNetworkRTgt")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(83l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149908575l)).
-             setPropName("GbpBridgeDomainFromNetworkRTgt").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(95l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149908575l))
+            .setPropName("GbpBridgeDomainFromNetworkRTgt")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(95l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(74).
-             setClassName("GbpRoutingDomain").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(74)
+            .setClassName("GbpRoutingDomain")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2534,61 +2531,61 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2457602l)).
-             setPropName("address").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2457602l))
+            .setPropName("address")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2457606l)).
-             setPropName("ipv6AdvAutonomousFlag").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2457606l))
+            .setPropName("ipv6AdvAutonomousFlag")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2457607l)).
-             setPropName("ipv6AdvPreferredLifetime").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2457607l))
+            .setPropName("ipv6AdvPreferredLifetime")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2457605l)).
-             setPropName("ipv6AdvValidLifetime").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2457605l))
+            .setPropName("ipv6AdvValidLifetime")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2457601l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2457601l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2457603l)).
-             setPropName("prefixLen").
-             setType(PolicyPropertyInfo.PropertyType.U64).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2457603l))
+            .setPropName("prefixLen")
+            .setType(PolicyPropertyInfo.PropertyType.U64)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2457604l)).
-             setPropName("virtualRouterIp").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2457604l))
+            .setPropName("virtualRouterIp")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(75).
-             setClassName("GbpSubnet").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(75)
+            .setClassName("GbpSubnet")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2597,79 +2594,79 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("GbpIntraGroupPolicyT");
-        eib.setEnumValue("allow",new BigInteger(String.valueOf(0)));
-        eib.setEnumValue("require-contract",new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("allow", new BigInteger(String.valueOf(0)));
+        eib.setEnumValue("require-contract", new BigInteger(String.valueOf(1)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2490370l)).
-             setPropName("intraGroupPolicy").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2490370l))
+            .setPropName("intraGroupPolicy")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2490369l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2490369l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149974028l)).
-             setPropName("GbpeInstContext").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(12l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149974028l))
+            .setPropName("GbpeInstContext")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(12l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149974066l)).
-             setPropName("SpanMemberFromRefRTgt").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(50l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149974066l))
+            .setPropName("SpanMemberFromRefRTgt")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(50l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149974073l)).
-             setPropName("EpdrEndPointFromGroupRTgt").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(57l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149974073l))
+            .setPropName("EpdrEndPointFromGroupRTgt")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(57l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149974098l)).
-             setPropName("GbpEpGroupToNetworkRSrc").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(82l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149974098l))
+            .setPropName("GbpEpGroupToNetworkRSrc")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(82l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149974101l)).
-             setPropName("GbpEpGroupToProvContractRSrc").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(85l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149974101l))
+            .setPropName("GbpEpGroupToProvContractRSrc")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(85l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2149974106l)).
-             setPropName("GbpEpGroupToConsContractRSrc").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(90l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2149974106l))
+            .setPropName("GbpEpGroupToConsContractRSrc")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(90l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(76).
-             setClassName("GbpEpGroup").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(76)
+            .setClassName("GbpEpGroup")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2677,43 +2674,43 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2555905l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2555905l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2150039627l)).
-             setPropName("GbpSubnet").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(75l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2150039627l))
+            .setPropName("GbpSubnet")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(75l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2150039631l)).
-             setPropName("GbpSubnetsToNetworkRSrc").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(79l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2150039631l))
+            .setPropName("GbpSubnetsToNetworkRSrc")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(79l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2150039635l)).
-             setPropName("GbpEpGroupFromNetworkRTgt").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(83l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2150039635l))
+            .setPropName("GbpEpGroupFromNetworkRTgt")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(83l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(78).
-             setClassName("GbpSubnets").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(78)
+            .setClassName("GbpSubnets")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2721,18 +2718,18 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2588675l)).
-             setPropName("target").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2588675l))
+            .setPropName("target")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(79).
-             setClassName("GbpSubnetsToNetworkRSrc").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(79)
+            .setClassName("GbpSubnetsToNetworkRSrc")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2741,48 +2738,48 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2621442l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2621442l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2621443l)).
-             setPropName("source").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2621443l))
+            .setPropName("source")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2621441l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2621441l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(80).
-             setClassName("GbpSubnetsFromNetworkRTgt").
-             setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(80)
+            .setClassName("GbpSubnetsFromNetworkRTgt")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2791,40 +2788,40 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2654210l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2654210l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2654209l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2654209l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(81).
-             setClassName("GbpSubnetsToNetworkRRes").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(81)
+            .setClassName("GbpSubnetsToNetworkRRes")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2832,18 +2829,18 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2686979l)).
-             setPropName("target").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2686979l))
+            .setPropName("target")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(82).
-             setClassName("GbpEpGroupToNetworkRSrc").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(82)
+            .setClassName("GbpEpGroupToNetworkRSrc")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2852,48 +2849,48 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2719746l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2719746l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2719747l)).
-             setPropName("source").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2719747l))
+            .setPropName("source")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2719745l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2719745l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(83).
-             setClassName("GbpEpGroupFromNetworkRTgt").
-             setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(83)
+            .setClassName("GbpEpGroupFromNetworkRTgt")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2902,40 +2899,40 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2752514l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2752514l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2752513l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2752513l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(84).
-             setClassName("GbpEpGroupToNetworkRRes").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(84)
+            .setClassName("GbpEpGroupToNetworkRRes")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2943,19 +2940,19 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2785283l)).
-             setPropName("target").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2785283l))
+            .setPropName("target")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(85).
-             setClassName("GbpEpGroupToProvContractRSrc").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(85)
+            .setClassName("GbpEpGroupToProvContractRSrc")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -2964,48 +2961,48 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2818050l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2818050l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2818051l)).
-             setPropName("source").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2818051l))
+            .setPropName("source")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2818049l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2818049l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(86).
-             setClassName("GbpEpGroupFromProvContractRTgt").
-             setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(86)
+            .setClassName("GbpEpGroupFromProvContractRTgt")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -3013,59 +3010,59 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2850817l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2850817l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2150334476l)).
-             setPropName("GbpeInstContext").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(12l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2150334476l))
+            .setPropName("GbpeInstContext")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(12l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2150334544l)).
-             setPropName("GbpSubnetsFromNetworkRTgt").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(80l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2150334544l))
+            .setPropName("GbpSubnetsFromNetworkRTgt")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(80l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2150334547l)).
-             setPropName("GbpEpGroupFromNetworkRTgt").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(83l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2150334547l))
+            .setPropName("GbpEpGroupFromNetworkRTgt")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(83l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2150334552l)).
-             setPropName("GbpBridgeDomainToNetworkRSrc").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(88l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2150334552l))
+            .setPropName("GbpBridgeDomainToNetworkRSrc")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(88l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2150334563l)).
-             setPropName("GbpFloodDomainFromNetworkRTgt").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(99l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2150334563l))
+            .setPropName("GbpFloodDomainFromNetworkRTgt")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(99l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(87).
-             setClassName("GbpBridgeDomain").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(87)
+            .setClassName("GbpBridgeDomain")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -3073,18 +3070,18 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2883587l)).
-             setPropName("target").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2883587l))
+            .setPropName("target")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(88).
-             setClassName("GbpBridgeDomainToNetworkRSrc").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(88)
+            .setClassName("GbpBridgeDomainToNetworkRSrc")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -3093,40 +3090,40 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2916354l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2916354l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2916353l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2916353l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(89).
-             setClassName("GbpEpGroupToProvContractRRes").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(89)
+            .setClassName("GbpEpGroupToProvContractRRes")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -3134,19 +3131,19 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2949123l)).
-             setPropName("target").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2949123l))
+            .setPropName("target")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(90).
-             setClassName("GbpEpGroupToConsContractRSrc").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(90)
+            .setClassName("GbpEpGroupToConsContractRSrc")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -3155,48 +3152,48 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2981890l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2981890l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2981891l)).
-             setPropName("source").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2981891l))
+            .setPropName("source")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2981889l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(2981889l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(91).
-             setClassName("GbpEpGroupFromConsContractRTgt").
-             setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(91)
+            .setClassName("GbpEpGroupFromConsContractRTgt")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -3205,40 +3202,40 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(3014658l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(3014658l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(3014657l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(3014657l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(92).
-             setClassName("GbpEpGroupToConsContractRRes").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(92)
+            .setClassName("GbpEpGroupToConsContractRRes")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -3247,48 +3244,48 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(3112962l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(3112962l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(3112963l)).
-             setPropName("source").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(3112963l))
+            .setPropName("source")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(3112961l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(3112961l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(95).
-             setClassName("GbpBridgeDomainFromNetworkRTgt").
-             setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(95)
+            .setClassName("GbpBridgeDomainFromNetworkRTgt")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -3297,40 +3294,40 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(3145730l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(3145730l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(3145729l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(3145729l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(96).
-             setClassName("GbpBridgeDomainToNetworkRRes").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(96)
+            .setClassName("GbpBridgeDomainToNetworkRRes")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -3339,91 +3336,91 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("GbpAddressResModeT");
-        eib.setEnumValue("drop",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("flood",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("unicast",new BigInteger(String.valueOf(0)));
+        eib.setEnumValue("drop", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("flood", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("unicast", new BigInteger(String.valueOf(0)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(3178498l)).
-             setPropName("arpMode").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(3178498l))
+            .setPropName("arpMode")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(3178497l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(3178497l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         eib = new EnumInfoBuilder();
         eib.setName("GbpAddressResModeT");
-        eib.setEnumValue("drop",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("flood",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("unicast",new BigInteger(String.valueOf(0)));
+        eib.setEnumValue("drop", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("flood", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("unicast", new BigInteger(String.valueOf(0)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(3178499l)).
-             setPropName("neighborDiscMode").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(3178499l))
+            .setPropName("neighborDiscMode")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("GbpUnknownFloodModeT");
-        eib.setEnumValue("drop",new BigInteger(String.valueOf(0)));
-        eib.setEnumValue("flood",new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("drop", new BigInteger(String.valueOf(0)));
+        eib.setEnumValue("flood", new BigInteger(String.valueOf(1)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(3178500l)).
-             setPropName("unknownFloodMode").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(3178500l))
+            .setPropName("unknownFloodMode")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2150662161l)).
-             setPropName("GbpeFloodContext").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(17l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2150662161l))
+            .setPropName("GbpeFloodContext")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(17l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2150662224l)).
-             setPropName("GbpSubnetsFromNetworkRTgt").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(80l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2150662224l))
+            .setPropName("GbpSubnetsFromNetworkRTgt")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(80l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2150662227l)).
-             setPropName("GbpEpGroupFromNetworkRTgt").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(83l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2150662227l))
+            .setPropName("GbpEpGroupFromNetworkRTgt")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(83l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2150662242l)).
-             setPropName("GbpFloodDomainToNetworkRSrc").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(98l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2150662242l))
+            .setPropName("GbpFloodDomainToNetworkRSrc")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(98l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(97).
-             setClassName("GbpFloodDomain").
-             setPolicyType(PolicyClassInfo.PolicyClassType.POLICY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(97)
+            .setClassName("GbpFloodDomain")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.POLICY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -3431,18 +3428,18 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(3211267l)).
-             setPropName("target").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(3211267l))
+            .setPropName("target")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(98).
-             setClassName("GbpFloodDomainToNetworkRSrc").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(98)
+            .setClassName("GbpFloodDomainToNetworkRSrc")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -3451,48 +3448,48 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(3244034l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(3244034l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(3244035l)).
-             setPropName("source").
-             setType(PolicyPropertyInfo.PropertyType.REFERENCE).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(3244035l))
+            .setPropName("source")
+            .setType(PolicyPropertyInfo.PropertyType.REFERENCE)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(3244033l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(3244033l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(99).
-             setClassName("GbpFloodDomainFromNetworkRTgt").
-             setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(99)
+            .setClassName("GbpFloodDomainFromNetworkRTgt")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.REVERSE_RELATIONSHIP)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -3501,40 +3498,40 @@ public class AgentOvsMit implements OpflexMit {
         classKeys = new ArrayList<PolicyPropertyId>();
         eib = new EnumInfoBuilder();
         eib.setName("RelatorRoleT");
-        eib.setEnumValue("resolver",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("source",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("target",new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("resolver", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("source", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("target", new BigInteger(String.valueOf(2)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(3276802l)).
-             setPropName("role").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(3276802l))
+            .setPropName("role")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         eib = new EnumInfoBuilder();
         eib.setName("RelatorTypeT");
-        eib.setEnumValue("direct-association",new BigInteger(String.valueOf(1)));
-        eib.setEnumValue("direct-dependency",new BigInteger(String.valueOf(3)));
-        eib.setEnumValue("named-association",new BigInteger(String.valueOf(2)));
-        eib.setEnumValue("named-dependency",new BigInteger(String.valueOf(4)));
-        eib.setEnumValue("reference",new BigInteger(String.valueOf(8)));
+        eib.setEnumValue("direct-association", new BigInteger(String.valueOf(1)));
+        eib.setEnumValue("direct-dependency", new BigInteger(String.valueOf(3)));
+        eib.setEnumValue("named-association", new BigInteger(String.valueOf(2)));
+        eib.setEnumValue("named-dependency", new BigInteger(String.valueOf(4)));
+        eib.setEnumValue("reference", new BigInteger(String.valueOf(8)));
         ei = eib.build();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(3276801l)).
-             setPropName("type").
-             setType(PolicyPropertyInfo.PropertyType.ENUM8).
-             setEnumInfo(ei).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(3276801l))
+            .setPropName("type")
+            .setType(PolicyPropertyInfo.PropertyType.ENUM8)
+            .setEnumInfo(ei)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(100).
-             setClassName("GbpFloodDomainToNetworkRRes").
-             setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(100)
+            .setClassName("GbpFloodDomainToNetworkRRes")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.RESOLVER)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -3542,27 +3539,27 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2150826000l)).
-             setPropName("DfwEpCounter").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(16l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2150826000l))
+            .setPropName("DfwEpCounter")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(16l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2150826003l)).
-             setPropName("GbpeEpCounter").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(19l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2150826003l))
+            .setPropName("GbpeEpCounter")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(19l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(102).
-             setClassName("ObserverEpStatUniverse").
-             setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(102)
+            .setClassName("ObserverEpStatUniverse")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -3570,35 +3567,35 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2151251977l)).
-             setPropName("PlatformConfig").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(9l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2151251977l))
+            .setPropName("PlatformConfig")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(9l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2151251978l)).
-             setPropName("GbpeEpgMapping").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(10l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2151251978l))
+            .setPropName("GbpeEpgMapping")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(10l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2151252084l)).
-             setPropName("PolicySpace").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(116l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2151252084l))
+            .setPropName("PolicySpace")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(116l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(115).
-             setClassName("PolicyUniverse").
-             setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(115)
+            .setClassName("PolicyUniverse")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
@@ -3606,93 +3603,94 @@ public class AgentOvsMit implements OpflexMit {
         ppil = new ArrayList<PolicyPropertyInfo>();
         classKeys = new ArrayList<PolicyPropertyId>();
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(3801089l)).
-             setPropName("name").
-             setType(PolicyPropertyInfo.PropertyType.STRING).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        ppib.setPropId(new PolicyPropertyId(3801089l))
+            .setPropName("name")
+            .setType(PolicyPropertyInfo.PropertyType.STRING)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
         ppi = ppib.build();
         ppil.add(ppi);
         classKeys.add(ppi.getPropId());
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2151284754l)).
-             setPropName("GbpeL24Classifier").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(18l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2151284754l))
+            .setPropName("GbpeL24Classifier")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(18l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2151284800l)).
-             setPropName("GbpContract").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(64l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2151284800l))
+            .setPropName("GbpContract")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(64l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2151284810l)).
-             setPropName("GbpRoutingDomain").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(74l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2151284810l))
+            .setPropName("GbpRoutingDomain")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(74l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2151284812l)).
-             setPropName("GbpEpGroup").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(76l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2151284812l))
+            .setPropName("GbpEpGroup")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(76l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2151284814l)).
-             setPropName("GbpSubnets").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(78l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2151284814l))
+            .setPropName("GbpSubnets")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(78l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2151284823l)).
-             setPropName("GbpBridgeDomain").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(87l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2151284823l))
+            .setPropName("GbpBridgeDomain")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(87l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         ppib = new PolicyPropertyInfoBuilder();
-        ppib.setPropId(new PolicyPropertyId(2151284833l)).
-             setPropName("GbpFloodDomain").
-             setType(PolicyPropertyInfo.PropertyType.COMPOSITE).
-             setClassId(97l).
-             setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        ppib.setPropId(new PolicyPropertyId(2151284833l))
+            .setPropName("GbpFloodDomain")
+            .setType(PolicyPropertyInfo.PropertyType.COMPOSITE)
+            .setClassId(97l)
+            .setPropCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
         ppi = ppib.build();
         ppil.add(ppi);
         pcib = new PolicyClassInfoBuilder();
-        pcib.setClassId(116).
-             setClassName("PolicySpace").
-             setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY).
-             setProperty(ppil).
-             setKey(classKeys);
+        pcib.setClassId(116)
+            .setClassName("PolicySpace")
+            .setPolicyType(PolicyClassInfo.PolicyClassType.LOCAL_ONLY)
+            .setProperty(ppil)
+            .setKey(classKeys);
         pci = pcib.build();
         metaData.put(pci.getClassName(), pci);
         classIdToString.put(Long.valueOf(pci.getClassId()), pci.getClassName());
 
         metaDataMap = Collections.unmodifiableMap(metaData);
         classIdToStringMap = Collections.unmodifiableMap(classIdToString);
-       }
-
-       @Override
-       public PolicyClassInfo getClass(String name) {
-               return metaDataMap.get(name);
-       }
-
-       @Override
-       public PolicyClassInfo getClass(Long classId) {
-               String className = classIdToStringMap.get(classId);
-               if (className == null) return null;
-               return metaDataMap.get(className);
-       }
+    }
+
+    @Override
+    public PolicyClassInfo getClass(String name) {
+        return metaDataMap.get(name);
+    }
+
+    @Override
+    public PolicyClassInfo getClass(Long classId) {
+        String className = classIdToStringMap.get(classId);
+        if (className == null)
+            return null;
+        return metaDataMap.get(className);
+    }
 
 }
index dee20052623bd9860eccd36b628f02725c616b79..e9fd9a69f9d072a9dcf93819ebae6d348b484486 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
+ * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -17,99 +17,99 @@ import java.util.Map;
  * PropertyInfo object map
  *
  * @author tbachman
- *
  */
 public interface EnumInfo {
 
-       /**
-        * Get the name of the enum as it appears in the MIT's
-        * PropertyInfo map.
-        *
-        * @return
-        */
-       public String getName();
-
-       /**
-        * Get the Integer representation of the value by name
-        * for the enum
-        *
-        * @param name
-        * @return
-        */
-       public BigInteger getEnumValue(String name);
-
-       public String getEnumValue(BigInteger value);
-
-       /**
-        * Class for building immutable EnumInfo objects
-        *
-        * @author tbachman
-        *
-        */
-       public static class EnumInfoBuilder {
-               private String name;
-               private Map<String, BigInteger> enumValuesByString;
-               private Map<BigInteger, String> enumValuesByInt;
-
-               public EnumInfoBuilder() {
-                       this.enumValuesByString = new HashMap<String, BigInteger>();
-                       this.enumValuesByInt = new HashMap<BigInteger, String>();
-               }
-
-               /**
-                * Set the name of the EnumInfo object
-                *
-                * @param name
-                * @return
-                */
-               public EnumInfoBuilder setName(String name) {
-                       this.name = name;
-                       return this;
-               }
-
-               /**
-                * Add a name/value pair to the enum, where
-                * value is an Integer object
-                *
-                * @param name
-                * @param value
-                * @return
-                */
-               public EnumInfoBuilder setEnumValue(String name, BigInteger value) {
-                       this.enumValuesByString.put(name, value);
-                       this.enumValuesByInt.put(value, name);
-                       return this;
-               }
-
-               public EnumInfo build() {
-                       return new EnumInfoImpl(this);
-               }
-
-               public static class EnumInfoImpl implements EnumInfo {
-                       private final String name;
-                       private final Map<String, BigInteger> enumValuesByString;
-                       private final Map<BigInteger, String> enumValuesByInt;
-
-                       public EnumInfoImpl(EnumInfoBuilder builder) {
-                               this.name = builder.name;
-                               this.enumValuesByString = builder.enumValuesByString;
-                               this.enumValuesByInt = builder.enumValuesByInt;
-                       }
-
-                       @Override
-                       public String getName() {
-                               return this.name;
-                       }
-
-                       @Override
-                       public BigInteger getEnumValue(String name) {
-                               return this.enumValuesByString.get(name);
-                       }
-
-                       @Override
-                       public String getEnumValue(BigInteger value) {
-                               return this.enumValuesByInt.get(value);
-                       }
-               }
-       }
+    /**
+     * Get the name of the enum as it appears in the MIT's
+     * PropertyInfo map.
+     *
+     * @return
+     */
+    public String getName();
+
+    /**
+     * Get the Integer representation of the value by name
+     * for the enum
+     *
+     * @param name
+     * @return
+     */
+    public BigInteger getEnumValue(String name);
+
+    public String getEnumValue(BigInteger value);
+
+    /**
+     * Class for building immutable EnumInfo objects
+     *
+     * @author tbachman
+     */
+    public static class EnumInfoBuilder {
+
+        private String name;
+        private Map<String, BigInteger> enumValuesByString;
+        private Map<BigInteger, String> enumValuesByInt;
+
+        public EnumInfoBuilder() {
+            this.enumValuesByString = new HashMap<String, BigInteger>();
+            this.enumValuesByInt = new HashMap<BigInteger, String>();
+        }
+
+        /**
+         * Set the name of the EnumInfo object
+         *
+         * @param name
+         * @return
+         */
+        public EnumInfoBuilder setName(String name) {
+            this.name = name;
+            return this;
+        }
+
+        /**
+         * Add a name/value pair to the enum, where
+         * value is an Integer object
+         *
+         * @param name
+         * @param value
+         * @return
+         */
+        public EnumInfoBuilder setEnumValue(String name, BigInteger value) {
+            this.enumValuesByString.put(name, value);
+            this.enumValuesByInt.put(value, name);
+            return this;
+        }
+
+        public EnumInfo build() {
+            return new EnumInfoImpl(this);
+        }
+
+        public static class EnumInfoImpl implements EnumInfo {
+
+            private final String name;
+            private final Map<String, BigInteger> enumValuesByString;
+            private final Map<BigInteger, String> enumValuesByInt;
+
+            public EnumInfoImpl(EnumInfoBuilder builder) {
+                this.name = builder.name;
+                this.enumValuesByString = builder.enumValuesByString;
+                this.enumValuesByInt = builder.enumValuesByInt;
+            }
+
+            @Override
+            public String getName() {
+                return this.name;
+            }
+
+            @Override
+            public BigInteger getEnumValue(String name) {
+                return this.enumValuesByString.get(name);
+            }
+
+            @Override
+            public String getEnumValue(BigInteger value) {
+                return this.enumValuesByInt.get(value);
+            }
+        }
+    }
 }
index e195958afb3ff79358c674cbf31a7f068438523f..5061e3d281e34cda2d71114ea6ea397c701722c7 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
+ * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -30,429 +30,446 @@ public class MitLib {
 
     protected static final Logger LOG = LoggerFactory.getLogger(MitLib.class);
     private ObjectMapper objectMapper;
-       private JsonNodeFactory jnf;
-
-       @JsonSerialize
-       public static class Reference {
-               String subject;
-               String reference_uri;
-               public String getSubject() {
-                       return subject;
-               }
-               public void setSubject(String subject) {
-                       this.subject = subject;
-               }
-               public String getReference_uri() {
-                       return reference_uri;
-               }
-               public void setReference_uri(String reference_uri) {
-                       this.reference_uri = reference_uri;
-               }
-
-       }
-
-       public MitLib() {
-                objectMapper = new ObjectMapper();
-                objectMapper.configure(
-                           DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-                jnf = objectMapper.getNodeFactory();
-       }
-
-       public static final String REFERENCE_SUBJECT = "subject";
-       public static final String REFERENCE_URI = "reference_uri";
-
-       public BigInteger deserializeMoPropertyEnum(JsonNode node, PolicyPropertyInfo ppi) {
-
-               EnumInfo ei = ppi.getEnumInfo();
-               return  ei.getEnumValue(node.asText());
-       }
-
-       public String serializeMoPropertyEnum(PolicyPropertyInfo ppi, PolicyObjectInstance poi) {
-
-               EnumInfo ei = ppi.getEnumInfo();
-               return ei.getEnumValue(poi.getUint64(ppi.getPropId()));
-       }
-
-       /**
-        * Deserialize a REFERENCE property
-        *
-        * @param node
-        * @return
-        */
-       public PolicyObjectInstance.PolicyReference deserializeMoPropertyRef(JsonNode node, OpflexMit mit) {
-
-               JsonNode sn = node.findValue(REFERENCE_SUBJECT);
-               if (sn == null) return null;
-               JsonNode un = node.findValue(REFERENCE_URI);
-               if (un == null) return null;
-
-               PolicyClassInfo pci = mit.getClass(sn.asText());
-               if (pci == null) return null;
-
-               return new PolicyObjectInstance.PolicyReference(pci.getClassId(), new Uri(un.asText()));
-
-       }
-
-       /**
-        * Serialize a REFERENCE property
-        *
-        * @param reference
-        * @param mit
-        * @return
-        */
-       public ObjectNode serializeMoPropertyRef(PolicyObjectInstance.PolicyReference reference, OpflexMit mit) {
-
-               ObjectNode on = jnf.objectNode();
-           PolicyClassInfo pci = mit.getClass(reference.getClassId());
-           if (pci == null) return null;
-           PolicyUri puri = new PolicyUri(reference.getUri().getValue());
-           // walk our way up until we find a valid class
-           String identifier = puri.pop();
-           while (mit.getClass(identifier) == null) {
-                   identifier = puri.pop();
-           }
-               on.put(REFERENCE_SUBJECT, identifier);
-               on.put(REFERENCE_URI, reference.getUri().getValue());
-           return on;
-       }
-
-       /**
-        * Take the {@link ManagedObject} and deserialize the properties
-        * into a concrete type to be used by the renderer. It also
-        * adds URIs for any children that are referenced in the
-        * properties to the MO's "children" array.
-        *
-        * @param mo
-        */
-       public PolicyObjectInstance deserializeMoProperties(ManagedObject mo, OpflexMit mit) {
-
-               /*
-                * The subject gives us the class to use for the schema
-                */
-               PolicyClassInfo pci = mit.getClass(mo.getSubject());
-
-               // sanity checks
-               if (pci == null) return null;
-
-               PolicyObjectInstance poi = new PolicyObjectInstance(pci.getClassId());
-
-               if (mo.getProperties() == null) return poi;
-
-               for (ManagedObject.Property prop : mo.getProperties()) {
-                       PolicyPropertyInfo ppi = pci.getProperty(prop.getName());
-                       if ((ppi == null) || (prop.getData() == null)) continue;
-
-                       JsonNode node = prop.getData();
-
-                       boolean vectored = false;
-                       if (ppi.getPropCardinality().equals(PolicyPropertyInfo.PropertyCardinality.VECTOR)) {
-                               vectored = true;
-                       }
-                       switch(ppi.getType()) {
-                       case STRING:
-                               if (vectored == true) {
-                                       if (!node.isArray()) continue;
-
-                                       List<String> sl = new ArrayList<String>();
-                                       for (int i=0; i <node.size(); i++ ) {
-                                               JsonNode jn = node.get(i);
-                                               if (!jn.isTextual()) continue;
-
-                                               sl.add(jn.asText());
-                                       }
-                                       poi.setString(ppi.getPropId(), sl);
-                               }
-                               else {
-                                       if (!node.isTextual()) continue;
-
-                                       poi.setString(ppi.getPropId(), node.asText());
-                               }
-                               break;
-
-                       case U64:
-                               if (vectored == true) {
-                                       if (!node.isArray()) continue;
-
-                                       List<BigInteger> bil = new ArrayList<BigInteger>();
-
-                                       for (int i=0; i <node.size(); i++ ) {
-                                               JsonNode jn = node.get(i);
-                                               if (!jn.isBigInteger()) continue;
-
-                                               bil.add(new BigInteger(jn.asText()));
-                                       }
-                                       poi.setUint64(ppi.getPropId(), bil);
-                               }
-                               else {
-                                       if (!node.isBigInteger()) continue;
-
-                                       poi.setUint64(ppi.getPropId(), new BigInteger(node.asText()));
-                               }
-                               break;
-
-                       case S64:
-                               if (vectored == true) {
-                                       if (!node.isArray()) continue;
-
-                                       List<Long> ll = new ArrayList<Long>();
-
-                                       for (int i=0; i <node.size(); i++ ) {
-                                               JsonNode jn = node.get(i);
-
-                                               if (!jn.isBigInteger()) continue;
-
-                                               ll.add(jn.asLong());
-                                       }
-                                       poi.setInt64(ppi.getPropId(), ll);
-                               }
-                               else {
-                                       if (!node.isBigInteger()) continue;
-
-                                       poi.setInt64(ppi.getPropId(), node.asLong());
-                               }
-                               break;
-
-                       case REFERENCE:
-                               if (vectored == true) {
-                                       if (!node.isArray()) continue;
-
-                                       List<PolicyObjectInstance.PolicyReference> prl =
-                                                       new ArrayList<PolicyObjectInstance.PolicyReference>();
-
-                                       for (int i=0; i <node.size(); i++ ) {
-                                               JsonNode jn = node.get(i);
-                                               PolicyObjectInstance.PolicyReference pr = deserializeMoPropertyRef(jn, mit);
-                                               if (pr == null) continue;
-
-                                               prl.add(pr);
-                                       }
-                                       poi.setReference(ppi.getPropId(), prl);
-                               }
-                               else {
-                                       PolicyObjectInstance.PolicyReference pr = deserializeMoPropertyRef(node, mit);
-                                       if (pr == null) continue;
-
-                                       poi.setReference(ppi.getPropId(), pr);
-                               }
-                               break;
-
-                       case ENUM8:
-                       case ENUM16:
-                       case ENUM32:
-                       case ENUM64:
-                               if (vectored == true) {
-                                       if (!node.isArray()) continue;
-
-                                       List<BigInteger> bil = new ArrayList<BigInteger>();
-
-                                       for (int i=0; i <node.size(); i++ ) {
-                                               JsonNode jn = node.get(i);
-                                               if (!jn.isTextual()) continue;
-                                               BigInteger bi = deserializeMoPropertyEnum(node,ppi);
-
-                                               bil.add(bi);
-                                       }
-                                       poi.setUint64(ppi.getPropId(), bil);
-                               }
-                               else {
-                                       if (!node.isTextual()) continue;
-
-                                       BigInteger bi = deserializeMoPropertyEnum(node,ppi);
-                                       poi.setUint64(ppi.getPropId(), bi);
-                               }
-                               break;
-
-                       case MAC:
-                               if (vectored == true) {
-                                       if (!node.isArray()) continue;
-
-                                       List<MacAddress> ml = new ArrayList<MacAddress>();
-
-                                       for (int i=0; i <node.size(); i++ ) {
-                                               JsonNode jn = node.get(i);
-
-                                               if (!jn.isTextual()) continue;
-
-                                               ml.add(new MacAddress(jn.asText()));
-                                       }
-                                       poi.setMacAddress(ppi.getPropId(), ml);
-                               }
-                               else {
-                                       if (!node.isTextual()) continue;
-
-                                       poi.setMacAddress(ppi.getPropId(), new MacAddress(node.asText()));
-                               }
-                               break;
-
-                       case COMPOSITE:
-
-                       }
-
-               }
-
-               return poi;
-       }
-
-       /**
-        * Serialize the properties contained in the {@link PolicyObjectInstance}
-        * into the properties field of the {@link ManagedObject}
-        *
-        * @param pci
-        * @param poi
-        * @param mo
-        * @param mit
-        */
-       public void serializeMoProperties(PolicyClassInfo pci, PolicyObjectInstance poi, ManagedObject mo, OpflexMit mit) {
-
-               List<PolicyPropertyInfo> ppil = pci.getProperties();
-               if (ppil == null) return;
-
-               List<ManagedObject.Property> pl = new ArrayList<ManagedObject.Property>();
-
-               /*
-                * For serialization of values, we can cheat a bit,
-                * as the native "toString" method gives us exactly
-                * the formatting we need (including vectors).
-                */
-               for (PolicyPropertyInfo ppi: ppil) {
-                       /*
-                        * Skip any properties that aren't populated for this
-                        * object instance
-                        */
-                       if (ppi.getType() != PolicyPropertyInfo.PropertyType.COMPOSITE &&
-                               !poi.isSet(ppi.getPropId(), ppi.getType(), ppi.getPropCardinality())) {
-                               continue;
-                       }
-                       ManagedObject.Property p = null;
-                       boolean scalar = true;
-
-                       if (ppi.getPropCardinality() == PolicyPropertyInfo.PropertyCardinality.VECTOR) {
-                               scalar = false;
-                       }
-
-                       switch (ppi.getType()) {
-                       case STRING:
-                               p = new ManagedObject.Property();
-                               p.setName(ppi.getPropName());
-                               if (scalar == true) {
-                                       JsonNode jn = jnf.textNode(poi.getString(ppi.getPropId()));
-                                       p.setData(jn);
-                               }
-                               else {
-                                       int len = poi.getStringSize(ppi.getPropId());
-                                       ArrayNode an = jnf.arrayNode();
-                                       for (int i = 0; i < len; i++ ) {
-                                               an.add(poi.getString(ppi.getPropId(), i));
-                                       }
-                                       p.setData(an);
-                               }
-                               break;
-
-                       case S64:
-                               p = new ManagedObject.Property();
-                               p.setName(ppi.getPropName());
-                               if (scalar == true) {
-                                       JsonNode jn = jnf.numberNode(poi.getInt64(ppi.getPropId()));
-                                       p.setData(jn);
-                               }
-                               else {
-                                       int len = poi.getInt64Size(ppi.getPropId());
-                                       ArrayNode an = jnf.arrayNode();
-                                       for (int i = 0; i < len; i++ ) {
-                                               an.add(Long.valueOf(poi.getInt64(ppi.getPropId(), i)));
-                                       }
-                                       p.setData(an);
-                               }
-                               break;
-
-                       case ENUM8:
-                       case ENUM16:
-                       case ENUM32:
-                       case ENUM64:
-                               p = new ManagedObject.Property();
-                               p.setName(ppi.getPropName());
-                               if (scalar == true) {
-                                       JsonNode jn = jnf.textNode(serializeMoPropertyEnum(ppi, poi));
-                                       p.setData(jn);
-                               }
-                               else {
-                                       int len = poi.getUint64Size(ppi.getPropId());
-                                       ArrayNode an = jnf.arrayNode();
-                                       for (int i = 0; i < len; i++ ) {
-                                               an.add(serializeMoPropertyEnum(ppi, poi));
-                                       }
-                                       p.setData(an);
-                               }
-                               break;
-
-                       case U64:
-                               p = new ManagedObject.Property();
-                               p.setName(ppi.getPropName());
-                               if (scalar == true) {
-                                       JsonNode jn = jnf.numberNode(poi.getUint64(ppi.getPropId()));
-                                       p.setData(jn);
-                               }
-                               else {
-                                       int len = poi.getUint64Size(ppi.getPropId());
-                                       ArrayNode an = jnf.arrayNode();
-                                       for (int i = 0; i < len; i++ ) {
-                                               an.numberNode(poi.getUint64(ppi.getPropId()));
-                                       }
-                                       p.setData(an);
-                               }
-                               break;
-
-                       case MAC:
-                               p = new ManagedObject.Property();
-                               p.setName(ppi.getPropName());
-                               if (scalar == true) {
-                                       MacAddress mac = poi.getMacAddress(ppi.getPropId());
-                                       JsonNode jn = jnf.textNode(mac.getValue().toString());
-                                       p.setData(jn);
-                               }
-                               else {
-                                       int len = poi.getMacAddressSize(ppi.getPropId());
-                                       ArrayNode an = jnf.arrayNode();
-                                       for (int i = 0; i < len; i++ ) {
-                                               MacAddress mac = poi.getMacAddress(ppi.getPropId());
-                                               an.add(mac.getValue().toString());
-                                       }
-                                       p.setData(an);
-                               }
-                               break;
-
-                       case REFERENCE:
-                               p = new ManagedObject.Property();
-                               p.setName(ppi.getPropName());
-                               if (scalar == true) {
-                                       ObjectNode on = serializeMoPropertyRef(poi.getReference(ppi.getPropId()), mit);
-                                       p.setData(on);
-                               }
-                               else {
-                                       int len = poi.getReferenceSize(ppi.getPropId());
-                                       ArrayNode an = jnf.arrayNode();
-                                       for (int i = 0; i < len; i++ ) {
-                                               ObjectNode on = serializeMoPropertyRef(poi.getReference(ppi.getPropId(), i), mit);
-                                               an.add(on);
-                                       }
-                                       p.setData(an);
-                               }
-                               break;
-
-                       case COMPOSITE:
-                               /*
-                                * Get the URI to add to the list of children
-                                */
-                               break;
-
-                               default:
-
-                       }
-                       if (p != null) {
-                               pl.add(p);
-                       }
-               }
-
-               mo.setProperties(pl);
-       }
+    private JsonNodeFactory jnf;
+
+    @JsonSerialize
+    public static class Reference {
+
+        String subject;
+        String reference_uri;
+
+        public String getSubject() {
+            return subject;
+        }
+
+        public void setSubject(String subject) {
+            this.subject = subject;
+        }
+
+        public String getReference_uri() {
+            return reference_uri;
+        }
+
+        public void setReference_uri(String reference_uri) {
+            this.reference_uri = reference_uri;
+        }
+
+    }
+
+    public MitLib() {
+        objectMapper = new ObjectMapper();
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        jnf = objectMapper.getNodeFactory();
+    }
+
+    public static final String REFERENCE_SUBJECT = "subject";
+    public static final String REFERENCE_URI = "reference_uri";
+
+    public BigInteger deserializeMoPropertyEnum(JsonNode node, PolicyPropertyInfo ppi) {
+
+        EnumInfo ei = ppi.getEnumInfo();
+        return ei.getEnumValue(node.asText());
+    }
+
+    public String serializeMoPropertyEnum(PolicyPropertyInfo ppi, PolicyObjectInstance poi) {
+
+        EnumInfo ei = ppi.getEnumInfo();
+        return ei.getEnumValue(poi.getUint64(ppi.getPropId()));
+    }
+
+    /**
+     * Deserialize a REFERENCE property
+     *
+     * @param node
+     * @return
+     */
+    public PolicyObjectInstance.PolicyReference deserializeMoPropertyRef(JsonNode node, OpflexMit mit) {
+
+        JsonNode sn = node.findValue(REFERENCE_SUBJECT);
+        if (sn == null)
+            return null;
+        JsonNode un = node.findValue(REFERENCE_URI);
+        if (un == null)
+            return null;
+
+        PolicyClassInfo pci = mit.getClass(sn.asText());
+        if (pci == null)
+            return null;
+
+        return new PolicyObjectInstance.PolicyReference(pci.getClassId(), new Uri(un.asText()));
+
+    }
+
+    /**
+     * Serialize a REFERENCE property
+     *
+     * @param reference
+     * @param mit
+     * @return
+     */
+    public ObjectNode serializeMoPropertyRef(PolicyObjectInstance.PolicyReference reference, OpflexMit mit) {
+
+        ObjectNode on = jnf.objectNode();
+        PolicyClassInfo pci = mit.getClass(reference.getClassId());
+        if (pci == null)
+            return null;
+        PolicyUri puri = new PolicyUri(reference.getUri().getValue());
+        // walk our way up until we find a valid class
+        String identifier = puri.pop();
+        while (mit.getClass(identifier) == null) {
+            identifier = puri.pop();
+        }
+        on.put(REFERENCE_SUBJECT, identifier);
+        on.put(REFERENCE_URI, reference.getUri().getValue());
+        return on;
+    }
+
+    /**
+     * Take the {@link ManagedObject} and deserialize the properties
+     * into a concrete type to be used by the renderer. It also
+     * adds URIs for any children that are referenced in the
+     * properties to the MO's "children" array.
+     *
+     * @param mo
+     */
+    public PolicyObjectInstance deserializeMoProperties(ManagedObject mo, OpflexMit mit) {
+
+        /*
+         * The subject gives us the class to use for the schema
+         */
+        PolicyClassInfo pci = mit.getClass(mo.getSubject());
+
+        // sanity checks
+        if (pci == null)
+            return null;
+
+        PolicyObjectInstance poi = new PolicyObjectInstance(pci.getClassId());
+
+        if (mo.getProperties() == null)
+            return poi;
+
+        for (ManagedObject.Property prop : mo.getProperties()) {
+            PolicyPropertyInfo ppi = pci.getProperty(prop.getName());
+            if ((ppi == null) || (prop.getData() == null))
+                continue;
+
+            JsonNode node = prop.getData();
+
+            boolean vectored = false;
+            if (ppi.getPropCardinality().equals(PolicyPropertyInfo.PropertyCardinality.VECTOR)) {
+                vectored = true;
+            }
+            switch (ppi.getType()) {
+                case STRING:
+                    if (vectored == true) {
+                        if (!node.isArray())
+                            continue;
+
+                        List<String> sl = new ArrayList<String>();
+                        for (int i = 0; i < node.size(); i++) {
+                            JsonNode jn = node.get(i);
+                            if (!jn.isTextual())
+                                continue;
+
+                            sl.add(jn.asText());
+                        }
+                        poi.setString(ppi.getPropId(), sl);
+                    } else {
+                        if (!node.isTextual())
+                            continue;
+
+                        poi.setString(ppi.getPropId(), node.asText());
+                    }
+                    break;
+
+                case U64:
+                    if (vectored == true) {
+                        if (!node.isArray())
+                            continue;
+
+                        List<BigInteger> bil = new ArrayList<BigInteger>();
+
+                        for (int i = 0; i < node.size(); i++) {
+                            JsonNode jn = node.get(i);
+                            if (!jn.isBigInteger())
+                                continue;
+
+                            bil.add(new BigInteger(jn.asText()));
+                        }
+                        poi.setUint64(ppi.getPropId(), bil);
+                    } else {
+                        if (!node.isBigInteger())
+                            continue;
+
+                        poi.setUint64(ppi.getPropId(), new BigInteger(node.asText()));
+                    }
+                    break;
+
+                case S64:
+                    if (vectored == true) {
+                        if (!node.isArray())
+                            continue;
+
+                        List<Long> ll = new ArrayList<Long>();
+
+                        for (int i = 0; i < node.size(); i++) {
+                            JsonNode jn = node.get(i);
+
+                            if (!jn.isBigInteger())
+                                continue;
+
+                            ll.add(jn.asLong());
+                        }
+                        poi.setInt64(ppi.getPropId(), ll);
+                    } else {
+                        if (!node.isBigInteger())
+                            continue;
+
+                        poi.setInt64(ppi.getPropId(), node.asLong());
+                    }
+                    break;
+
+                case REFERENCE:
+                    if (vectored == true) {
+                        if (!node.isArray())
+                            continue;
+
+                        List<PolicyObjectInstance.PolicyReference> prl = new ArrayList<PolicyObjectInstance.PolicyReference>();
+
+                        for (int i = 0; i < node.size(); i++) {
+                            JsonNode jn = node.get(i);
+                            PolicyObjectInstance.PolicyReference pr = deserializeMoPropertyRef(jn, mit);
+                            if (pr == null)
+                                continue;
+
+                            prl.add(pr);
+                        }
+                        poi.setReference(ppi.getPropId(), prl);
+                    } else {
+                        PolicyObjectInstance.PolicyReference pr = deserializeMoPropertyRef(node, mit);
+                        if (pr == null)
+                            continue;
+
+                        poi.setReference(ppi.getPropId(), pr);
+                    }
+                    break;
+
+                case ENUM8:
+                case ENUM16:
+                case ENUM32:
+                case ENUM64:
+                    if (vectored == true) {
+                        if (!node.isArray())
+                            continue;
+
+                        List<BigInteger> bil = new ArrayList<BigInteger>();
+
+                        for (int i = 0; i < node.size(); i++) {
+                            JsonNode jn = node.get(i);
+                            if (!jn.isTextual())
+                                continue;
+                            BigInteger bi = deserializeMoPropertyEnum(node, ppi);
+
+                            bil.add(bi);
+                        }
+                        poi.setUint64(ppi.getPropId(), bil);
+                    } else {
+                        if (!node.isTextual())
+                            continue;
+
+                        BigInteger bi = deserializeMoPropertyEnum(node, ppi);
+                        poi.setUint64(ppi.getPropId(), bi);
+                    }
+                    break;
+
+                case MAC:
+                    if (vectored == true) {
+                        if (!node.isArray())
+                            continue;
+
+                        List<MacAddress> ml = new ArrayList<MacAddress>();
+
+                        for (int i = 0; i < node.size(); i++) {
+                            JsonNode jn = node.get(i);
+
+                            if (!jn.isTextual())
+                                continue;
+
+                            ml.add(new MacAddress(jn.asText()));
+                        }
+                        poi.setMacAddress(ppi.getPropId(), ml);
+                    } else {
+                        if (!node.isTextual())
+                            continue;
+
+                        poi.setMacAddress(ppi.getPropId(), new MacAddress(node.asText()));
+                    }
+                    break;
+
+                case COMPOSITE:
+
+            }
+
+        }
+
+        return poi;
+    }
+
+    /**
+     * Serialize the properties contained in the {@link PolicyObjectInstance} into the properties
+     * field of the {@link ManagedObject}
+     *
+     * @param pci
+     * @param poi
+     * @param mo
+     * @param mit
+     */
+    public void serializeMoProperties(PolicyClassInfo pci, PolicyObjectInstance poi, ManagedObject mo, OpflexMit mit) {
+
+        List<PolicyPropertyInfo> ppil = pci.getProperties();
+        if (ppil == null)
+            return;
+
+        List<ManagedObject.Property> pl = new ArrayList<ManagedObject.Property>();
+
+        /*
+         * For serialization of values, we can cheat a bit,
+         * as the native "toString" method gives us exactly
+         * the formatting we need (including vectors).
+         */
+        for (PolicyPropertyInfo ppi : ppil) {
+            /*
+             * Skip any properties that aren't populated for this
+             * object instance
+             */
+            if (ppi.getType() != PolicyPropertyInfo.PropertyType.COMPOSITE
+                    && !poi.isSet(ppi.getPropId(), ppi.getType(), ppi.getPropCardinality())) {
+                continue;
+            }
+            ManagedObject.Property p = null;
+            boolean scalar = true;
+
+            if (ppi.getPropCardinality() == PolicyPropertyInfo.PropertyCardinality.VECTOR) {
+                scalar = false;
+            }
+
+            switch (ppi.getType()) {
+                case STRING:
+                    p = new ManagedObject.Property();
+                    p.setName(ppi.getPropName());
+                    if (scalar == true) {
+                        JsonNode jn = jnf.textNode(poi.getString(ppi.getPropId()));
+                        p.setData(jn);
+                    } else {
+                        int len = poi.getStringSize(ppi.getPropId());
+                        ArrayNode an = jnf.arrayNode();
+                        for (int i = 0; i < len; i++) {
+                            an.add(poi.getString(ppi.getPropId(), i));
+                        }
+                        p.setData(an);
+                    }
+                    break;
+
+                case S64:
+                    p = new ManagedObject.Property();
+                    p.setName(ppi.getPropName());
+                    if (scalar == true) {
+                        JsonNode jn = jnf.numberNode(poi.getInt64(ppi.getPropId()));
+                        p.setData(jn);
+                    } else {
+                        int len = poi.getInt64Size(ppi.getPropId());
+                        ArrayNode an = jnf.arrayNode();
+                        for (int i = 0; i < len; i++) {
+                            an.add(Long.valueOf(poi.getInt64(ppi.getPropId(), i)));
+                        }
+                        p.setData(an);
+                    }
+                    break;
+
+                case ENUM8:
+                case ENUM16:
+                case ENUM32:
+                case ENUM64:
+                    p = new ManagedObject.Property();
+                    p.setName(ppi.getPropName());
+                    if (scalar == true) {
+                        JsonNode jn = jnf.textNode(serializeMoPropertyEnum(ppi, poi));
+                        p.setData(jn);
+                    } else {
+                        int len = poi.getUint64Size(ppi.getPropId());
+                        ArrayNode an = jnf.arrayNode();
+                        for (int i = 0; i < len; i++) {
+                            an.add(serializeMoPropertyEnum(ppi, poi));
+                        }
+                        p.setData(an);
+                    }
+                    break;
+
+                case U64:
+                    p = new ManagedObject.Property();
+                    p.setName(ppi.getPropName());
+                    if (scalar == true) {
+                        JsonNode jn = jnf.numberNode(poi.getUint64(ppi.getPropId()));
+                        p.setData(jn);
+                    } else {
+                        int len = poi.getUint64Size(ppi.getPropId());
+                        ArrayNode an = jnf.arrayNode();
+                        for (int i = 0; i < len; i++) {
+                            an.numberNode(poi.getUint64(ppi.getPropId()));
+                        }
+                        p.setData(an);
+                    }
+                    break;
+
+                case MAC:
+                    p = new ManagedObject.Property();
+                    p.setName(ppi.getPropName());
+                    if (scalar == true) {
+                        MacAddress mac = poi.getMacAddress(ppi.getPropId());
+                        JsonNode jn = jnf.textNode(mac.getValue().toString());
+                        p.setData(jn);
+                    } else {
+                        int len = poi.getMacAddressSize(ppi.getPropId());
+                        ArrayNode an = jnf.arrayNode();
+                        for (int i = 0; i < len; i++) {
+                            MacAddress mac = poi.getMacAddress(ppi.getPropId());
+                            an.add(mac.getValue().toString());
+                        }
+                        p.setData(an);
+                    }
+                    break;
+
+                case REFERENCE:
+                    p = new ManagedObject.Property();
+                    p.setName(ppi.getPropName());
+                    if (scalar == true) {
+                        ObjectNode on = serializeMoPropertyRef(poi.getReference(ppi.getPropId()), mit);
+                        p.setData(on);
+                    } else {
+                        int len = poi.getReferenceSize(ppi.getPropId());
+                        ArrayNode an = jnf.arrayNode();
+                        for (int i = 0; i < len; i++) {
+                            ObjectNode on = serializeMoPropertyRef(poi.getReference(ppi.getPropId(), i), mit);
+                            an.add(on);
+                        }
+                        p.setData(an);
+                    }
+                    break;
+
+                case COMPOSITE:
+                    /*
+                     * Get the URI to add to the list of children
+                     */
+                    break;
+
+                default:
+
+            }
+            if (p != null) {
+                pl.add(p);
+            }
+        }
+
+        mo.setProperties(pl);
+    }
 }
index 55f29b1816eec4c5e0f24289fa44c703a60e01fd..756264b2b5784aaa774d2734831256881fb65bda 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 
@@ -15,25 +15,23 @@ package org.opendaylight.groupbasedpolicy.renderer.opflex.mit;
  * nature of the actual MIT.
  *
  * @author tbachman
- *
  */
 public interface OpflexMit {
 
-       /**
-        * Get a ClassInfo object from the MIT by name
-        *
-        * @param name
-        * @return
-        */
-       public PolicyClassInfo getClass(String name);
-
-       /**
-        * Get a ClassInfo object from the MIT by class ID
-        * @param classId
-        * @return
-        */
-       public PolicyClassInfo getClass(Long classId);
-
+    /**
+     * Get a ClassInfo object from the MIT by name
+     *
+     * @param name
+     * @return
+     */
+    public PolicyClassInfo getClass(String name);
 
+    /**
+     * Get a ClassInfo object from the MIT by class ID
+     * 
+     * @param classId
+     * @return
+     */
+    public PolicyClassInfo getClass(Long classId);
 
 }
index 9d778a9f6cac4f245a3a99c487b869c86b26f730..9e2686c0f214124e69b2097b1850d95f9afbb0ae 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
+ * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -15,198 +15,187 @@ import java.util.Map;
 
 import org.opendaylight.groupbasedpolicy.renderer.opflex.mit.PolicyPropertyInfo.PolicyPropertyId;
 
-
-
 /**
- * Class that provides Managed Object metadata. The
- * {@link PolicyClassInfo} object contains metadata about
+ * Class that provides Managed Object metadata. The {@link PolicyClassInfo} object contains metadata
+ * about
  * the Managed Object, while the {@link PropertyInfo} list
  * contained by this object provides the metadata about the
  * Managed Object properties.
- *
  * This data must be kept consistent with the agents.
  *
  * @author tbachman
- *
  */
 public interface PolicyClassInfo {
 
-       static public enum PolicyClassType {
-               POLICY("policy"),
-               REMOTE_ENDPOINT("remote_endpoint"),
-               LOCAL_ENDPOINT("local_endpoint"),
-               OBSERVABLE("observable"),
-               LOCAL_ONLY("local_only"),
-               RESOLVER("resolver"),
-               RELATIONSHIP("relationship"),
-               REVERSE_RELATIONSHIP("reverse_relationship");
-
-               private final String type;
-
-               PolicyClassType(String type) {
-                       this.type = type;
-               }
-
-               @Override
-               public String toString() {
-                       return this.type;
-               }
-       }
-
-       /**
-        * Get the ID for the class
-        *
-        * @return
-        */
-       public int getClassId() ;
-
-       /**
-        * Get the type for the class
-        *
-        * @return
-        */
-       public PolicyClassType getPolicyType();
-
-       /**
-        * Get the name for the class
-        *
-        * @return
-        */
-       public String getClassName();
-
-       /**
-        * Get a {@link PolicyPropertyInfo} object by name
-        * from the class.
-        *
-        * @param name
-        * @return
-        */
-       public PolicyPropertyInfo getProperty(String name);
-
-       /**
-        * Return the entire list of {@link PolicyPropertyInfo}
-        * objects for this class.
-        *
-        * @return
-        */
-       public List<PolicyPropertyInfo> getProperties();
-
-       /**
-        * Get a list of {@link PolicyPropertyId} objects,
-        * which are the keys to the {@link PolicyPropertyInfo}
-        * objects for this class.
-        *
-        * @return
-        */
-       public List<PolicyPropertyId> getKeys();
-
-       /**
-        * A builder class for create immutable instances of
-        * {@link PolicyClassInfo} objects.
-        *
-        * @author tbachman
-        *
-        */
-       public static class PolicyClassInfoBuilder {
-               private int classId;
-               private PolicyClassType policyType;
-               private String className;
-               private Map<String, PolicyPropertyInfo> properties;
-               private List<PolicyPropertyId> keys;
-
-               public PolicyClassInfoBuilder() {
-                       this.properties = new HashMap<String, PolicyPropertyInfo>();
-                       this.keys = new ArrayList<PolicyPropertyId>();
-               }
-
-               public int getClassId() {
-                       return classId;
-               }
-
-               public PolicyClassInfoBuilder setClassId(int classId) {
-                       this.classId = classId;
-                       return this;
-               }
-
-               public PolicyClassType getPolicyType() {
-                       return policyType;
-               }
-
-               public PolicyClassInfoBuilder setPolicyType(PolicyClassType policyType) {
-                       this.policyType = policyType;
-                       return this;
-               }
-
-               public String getClassName() {
-                       return className;
-               }
-
-               public PolicyClassInfoBuilder setClassName(String className) {
-                       this.className = className;
-                       return this;
-               }
-
-               public PolicyClassInfoBuilder setProperty(List<PolicyPropertyInfo> ppil) {
-                       for (PolicyPropertyInfo ppi: ppil) {
-                               this.properties.put(ppi.getPropName(),ppi);
-                       }
-                       return this;
-               }
-
-               public PolicyClassInfoBuilder setKey(List<PolicyPropertyId> pidl) {
-                       this.keys.addAll(pidl);
-                       return this;
-               }
-
-               public PolicyClassInfo build() {
-                       return new PolicyClassInfoImpl(this);
-               }
-
-               private static final class PolicyClassInfoImpl implements PolicyClassInfo {
-
-                       private final int classId;
-                       private final PolicyClassType policyType;
-                       private final String className;
-                       private final Map<String, PolicyPropertyInfo> properties;
-                       private List<PolicyPropertyId> keys;
-
-                       private PolicyClassInfoImpl(PolicyClassInfoBuilder builder) {
-                               this.classId = builder.classId;
-                               this.policyType = builder.policyType;
-                               this.className = builder.className;
-                               this.properties = builder.properties;
-                               this.keys = builder.keys;
-                       }
-                       @Override
-                       public int getClassId() {
-                               return classId;
-                       }
-
-                       @Override
-                       public PolicyClassType getPolicyType() {
-                               return policyType;
-                       }
-
-                       @Override
-                       public String getClassName() {
-                               return className;
-                       }
-
-                       @Override
-                       public PolicyPropertyInfo getProperty(String name) {
-                               return properties.get(name);
-                       }
-
-                       @Override
-                       public List<PolicyPropertyInfo> getProperties() {
-                               return new ArrayList<PolicyPropertyInfo>(properties.values());
-                       }
-
-                       @Override
-                       public List<PolicyPropertyId> getKeys() {
-                               return keys;
-                       }
-               }
-       }
+    static public enum PolicyClassType {
+        POLICY("policy"), REMOTE_ENDPOINT("remote_endpoint"), LOCAL_ENDPOINT("local_endpoint"), OBSERVABLE("observable"), LOCAL_ONLY(
+                "local_only"), RESOLVER("resolver"), RELATIONSHIP("relationship"), REVERSE_RELATIONSHIP(
+                "reverse_relationship");
+
+        private final String type;
+
+        PolicyClassType(String type) {
+            this.type = type;
+        }
+
+        @Override
+        public String toString() {
+            return this.type;
+        }
+    }
+
+    /**
+     * Get the ID for the class
+     *
+     * @return
+     */
+    public int getClassId();
+
+    /**
+     * Get the type for the class
+     *
+     * @return
+     */
+    public PolicyClassType getPolicyType();
+
+    /**
+     * Get the name for the class
+     *
+     * @return
+     */
+    public String getClassName();
+
+    /**
+     * Get a {@link PolicyPropertyInfo} object by name
+     * from the class.
+     *
+     * @param name
+     * @return
+     */
+    public PolicyPropertyInfo getProperty(String name);
+
+    /**
+     * Return the entire list of {@link PolicyPropertyInfo} objects for this class.
+     *
+     * @return
+     */
+    public List<PolicyPropertyInfo> getProperties();
+
+    /**
+     * Get a list of {@link PolicyPropertyId} objects,
+     * which are the keys to the {@link PolicyPropertyInfo} objects for this class.
+     *
+     * @return
+     */
+    public List<PolicyPropertyId> getKeys();
+
+    /**
+     * A builder class for create immutable instances of {@link PolicyClassInfo} objects.
+     *
+     * @author tbachman
+     */
+    public static class PolicyClassInfoBuilder {
+
+        private int classId;
+        private PolicyClassType policyType;
+        private String className;
+        private Map<String, PolicyPropertyInfo> properties;
+        private List<PolicyPropertyId> keys;
+
+        public PolicyClassInfoBuilder() {
+            this.properties = new HashMap<String, PolicyPropertyInfo>();
+            this.keys = new ArrayList<PolicyPropertyId>();
+        }
+
+        public int getClassId() {
+            return classId;
+        }
+
+        public PolicyClassInfoBuilder setClassId(int classId) {
+            this.classId = classId;
+            return this;
+        }
+
+        public PolicyClassType getPolicyType() {
+            return policyType;
+        }
+
+        public PolicyClassInfoBuilder setPolicyType(PolicyClassType policyType) {
+            this.policyType = policyType;
+            return this;
+        }
+
+        public String getClassName() {
+            return className;
+        }
+
+        public PolicyClassInfoBuilder setClassName(String className) {
+            this.className = className;
+            return this;
+        }
+
+        public PolicyClassInfoBuilder setProperty(List<PolicyPropertyInfo> ppil) {
+            for (PolicyPropertyInfo ppi : ppil) {
+                this.properties.put(ppi.getPropName(), ppi);
+            }
+            return this;
+        }
+
+        public PolicyClassInfoBuilder setKey(List<PolicyPropertyId> pidl) {
+            this.keys.addAll(pidl);
+            return this;
+        }
+
+        public PolicyClassInfo build() {
+            return new PolicyClassInfoImpl(this);
+        }
+
+        private static final class PolicyClassInfoImpl implements PolicyClassInfo {
+
+            private final int classId;
+            private final PolicyClassType policyType;
+            private final String className;
+            private final Map<String, PolicyPropertyInfo> properties;
+            private List<PolicyPropertyId> keys;
+
+            private PolicyClassInfoImpl(PolicyClassInfoBuilder builder) {
+                this.classId = builder.classId;
+                this.policyType = builder.policyType;
+                this.className = builder.className;
+                this.properties = builder.properties;
+                this.keys = builder.keys;
+            }
+
+            @Override
+            public int getClassId() {
+                return classId;
+            }
+
+            @Override
+            public PolicyClassType getPolicyType() {
+                return policyType;
+            }
+
+            @Override
+            public String getClassName() {
+                return className;
+            }
+
+            @Override
+            public PolicyPropertyInfo getProperty(String name) {
+                return properties.get(name);
+            }
+
+            @Override
+            public List<PolicyPropertyInfo> getProperties() {
+                return new ArrayList<PolicyPropertyInfo>(properties.values());
+            }
+
+            @Override
+            public List<PolicyPropertyId> getKeys() {
+                return keys;
+            }
+        }
+    }
 
 }
index 4f7806f7ed62c4d5707c13b264564549a99a1058..d4ffe99dcc27020e63ae00fbaa9ff8d4c68f739e 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
+ * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -21,816 +21,772 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.
  * between OpFlex messaging and the back-end policy.
  *
  * @author tbachman
- *
  */
 public class PolicyObjectInstance {
 
-       /**
-        * An object used as a key for the property hash map. It
-        * consists of the tuple: { {@link PolicyPropertyId},
-        * {@link PolicyPropertyInfo.PropertyType},
-        * {@link PolicyPropertyInfo.Propertycardinality} }
-        *
-        * @author tbachman
-        *
-        */
-       public static class PropertyKey {
-               private final PolicyPropertyId propId;
-               private final PolicyPropertyInfo.PropertyType type;
-               private final PolicyPropertyInfo.PropertyCardinality cardinality;
-
-               public PropertyKey(PolicyPropertyId propId, PolicyPropertyInfo.PropertyType type,
-                               PolicyPropertyInfo.PropertyCardinality cardinality) {
-                       this.propId = propId;
-                       this.type = type;
-                       this.cardinality = cardinality;
-               }
-
-               @Override
-               public int hashCode() {
-                       final int prime = 31;
-                       int result = 1;
-                       result = prime * result
-                                       + ((cardinality == null) ? 0 : cardinality.hashCode());
-                       result = prime * result
-                                       + ((propId == null) ? 0 : propId.hashCode());
-                       result = prime * result + ((type == null) ? 0 : type.hashCode());
-                       return result;
-               }
-
-               @Override
-               public boolean equals(Object obj) {
-                       if (this == obj)
-                               return true;
-                       if (obj == null)
-                               return false;
-                       if (getClass() != obj.getClass())
-                               return false;
-                       PropertyKey other = (PropertyKey) obj;
-                       if (cardinality != other.cardinality)
-                               return false;
-                       if (propId == null) {
-                               if (other.propId != null)
-                                       return false;
-                       } else if (!propId.equals(other.propId))
-                               return false;
-                       if (type != other.type)
-                               return false;
-                       return true;
-               }
-
-       }
-
-       /**
-        * Class that contains a value held by the {@link PolicyObjectInstance}.
-        * The value can be scalar or vector in nature.
-        *
-        * @author tbachman
-        *
-        */
-       public static class Value {
-               private Object v;
-               private List<Object> vl;
-               private PolicyPropertyInfo.PropertyType type;
-               private PolicyPropertyInfo.PropertyCardinality cardinality;
-               public void setPropertyType(PolicyPropertyInfo.PropertyType type) {
-                       this.type = type;
-               }
-
-               public void setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality cardinality) {
-                       this.cardinality = cardinality;
-               }
-
-               public void setValue(Object v) {
-                       this.v = v;
-               }
-
-               public void setValue(List<Object> vl) {
-                       this.vl = vl;
-               }
-
-               public Object getValue(int index) {
-                       if (this.cardinality == PolicyPropertyInfo.PropertyCardinality.VECTOR) {
-                               return this.vl.get(index);
-                       }
-                       else {
-                               return this.v;
-                       }
-               }
-
-               public PolicyPropertyInfo.PropertyType getType() {
-                       return this.type;
-               }
-       }
-
-       /**
-        * Class used as a reference to another PolicyObject.
-        *
-        * @author tbachman
-        *
-        */
-       public static class PolicyReference {
-               private final Uri uri;
-               private final long classId;
-
-               public PolicyReference(long classId, Uri uri) {
-                       this.uri = uri;
-                       this.classId = classId;
-               }
-
-               public Uri getUri() {
-                       return this.uri;
-               }
-
-               public long getClassId() {
-                       return this.classId;
-               }
-
-               @Override
-               public int hashCode() {
-                       final int prime = 31;
-                       int result = 1;
-                       result = prime * result + (int) (classId ^ (classId >>> 32));
-                       result = prime * result + ((uri == null) ? 0 : uri.hashCode());
-                       return result;
-               }
-
-               @Override
-               public boolean equals(Object obj) {
-                       if (this == obj)
-                               return true;
-                       if (obj == null)
-                               return false;
-                       if (getClass() != obj.getClass())
-                               return false;
-                       PolicyReference other = (PolicyReference) obj;
-                       if (classId != other.classId)
-                               return false;
-                       if (uri == null) {
-                               if (other.uri != null)
-                                       return false;
-                       } else if (!uri.equals(other.uri))
-                               return false;
-                       return true;
-               }
-
-       }
-
-       private long classId;
-       private Uri uri;
-       private Uri parentUri;
-       private String parentSubject;
-       private String parentRelation;
-       private List<Uri> children;
-       private HashMap<PropertyKey, Value> propertyMap;
-
-       private PolicyPropertyInfo.PropertyType normalize(PolicyPropertyInfo.PropertyType type) {
-               switch (type) {
-               case ENUM8:
-               case ENUM16:
-               case ENUM32:
-               case ENUM64:
-                       return PolicyPropertyInfo.PropertyType.U64;
-           default:
-               return type;
-               }
-       }
-
-       public PolicyObjectInstance(long classId) {
-               this.classId = classId;
-               this.children = new ArrayList<Uri>();
-               this.propertyMap = new HashMap<PropertyKey, Value>();
-       }
-
-       /**
-        * Get the class ID for this object instance.
-        *
-        * @return the class ID
-        */
-       public long getClassId() {
-               return this.classId;
-       }
-
-       public Uri getUri() {
-               return uri;
-       }
-
-       public void setUri(Uri uri) {
-               this.uri = uri;
-       }
-
-       public void addChild(Uri childUri) {
-               children.add(childUri);
-       }
-
-       public List<Uri> getChildren() {
-               return this.children;
-       }
-
-       public void setParent(Uri uri) {
-               this.parentUri = uri;
-       }
-
-       public Uri getParent() {
-               return this.parentUri;
-       }
-
-       public void setParentSubject(String subject) {
-               this.parentSubject = subject;
-       }
-
-       public String getParentSubject() {
-               return this.parentSubject;
-       }
-
-       public void setParentRelation(String relation) {
-               this.parentRelation = relation;
-       }
-
-       public String getParentRelation() {
-               return this.parentRelation;
-       }
-
-       /**
-        * Check whether the given property is set.  If the property is
-        * vector-valued, this will return false if the vector is zero length
-        *
-        * @param propId
-        * @param type
-        * @param cardinality
-        * @return true if set, false if not set or zero length vector
-        */
-       public boolean isSet(PolicyPropertyInfo.PolicyPropertyId propId,
-                       PolicyPropertyInfo.PropertyType type,
-                       PolicyPropertyInfo.PropertyCardinality cardinality) {
-               type = normalize(type);
-               PropertyKey key = new PropertyKey(propId, type, cardinality);
-               return propertyMap.containsKey(key);
-       }
-
-       /**
-        * Unset the given property.  If it's a vector, the vector is
-        * emptied.  If its a scalar, the scalar is unset.
-        *
-        * @param propId
-        * @param type
-        * @param cardinality
-        * @return true if the property was alread set before
-        */
-       public boolean unset(PolicyPropertyInfo.PolicyPropertyId propId,
-                       PolicyPropertyInfo.PropertyType type,
-                       PolicyPropertyInfo.PropertyCardinality cardinality) {
-               type = normalize(type);
-               PropertyKey key = new PropertyKey(propId, type, cardinality);
-               Value v = propertyMap.remove(key);
-               if (v == null) return false;
-               return true;
-       }
-
-       // getters
-
-       /**
-        * Get the unsigned 64-bit valued property for prop_name.
-        *
-        * @param id
-        * @return null if not present or {@link BigInteger}
-        */
-       public BigInteger getUint64(PolicyPropertyInfo.PolicyPropertyId id) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                       PolicyPropertyInfo.PropertyType.U64,
-                                                       PolicyPropertyInfo.PropertyCardinality.SCALAR);
-               return (BigInteger)propertyMap.get(key).getValue(0);
-       }
-
-       /**
-        * For a vector-valued 64-bit unsigned property, get the specified
-        * property value at the specified index
-        *
-        * @param id
-        * @param index
-        * @return the property value
-        */
-       public BigInteger getUint64(PolicyPropertyInfo.PolicyPropertyId id, int index) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                       PolicyPropertyInfo.PropertyType.U64,
-                                                       PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               return (BigInteger)propertyMap.get(key).getValue(index);
-       }
-
-       /**
-        * Get the number of unsigned 64-bit values for the specified
-        * property
-        *
-        * @param id
-        * @return the number of elements
-        */
-       public int getUint64Size(PolicyPropertyInfo.PolicyPropertyId id) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                       PolicyPropertyInfo.PropertyType.U64,
-                                                       PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               Value v = propertyMap.get(key);
-               return v.vl.size();
-       }
-
-       /**
-        * Get the signed 64-bit valued property for prop_name.
-        *
-        * @param id
-        * @return the property value
-        */
-       public long getInt64(PolicyPropertyInfo.PolicyPropertyId id) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                       PolicyPropertyInfo.PropertyType.S64,
-                                                       PolicyPropertyInfo.PropertyCardinality.SCALAR);
-               return (long)propertyMap.get(key).getValue(0);
-       }
-
-       /**
-        * For a vector-valued 64-bit signed property, get the specified
-        * property value at the specified index
-        *
-        * @param id
-        * @param index
-        * @return the property value
-        */
-       public long getInt64(PolicyPropertyInfo.PolicyPropertyId id, int index) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                       PolicyPropertyInfo.PropertyType.S64,
-                                                       PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               return (long)propertyMap.get(key).getValue(index);
-       }
-
-       /**
-        * Get the number of signed 64-bit values for the specified
-        * property
-        *
-        * @param id
-        * @return the number of elements
-        */
-       public int getInt64Size(PolicyPropertyInfo.PolicyPropertyId id) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                       PolicyPropertyInfo.PropertyType.S64,
-                                                       PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               Value v = propertyMap.get(key);
-               return v.vl.size();
-       }
-
-       /**
-        * Get the string-valued property for prop_name.
-        *
-        * @param id
-        * @return the property value
-        */
-       public String getString(PolicyPropertyInfo.PolicyPropertyId id) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                       PolicyPropertyInfo.PropertyType.STRING,
-                                                       PolicyPropertyInfo.PropertyCardinality.SCALAR);
-               return (String)propertyMap.get(key).getValue(0);
-       }
-
-       /**
-        * For a vector-valued string property, get the specified property
-        * value at the specified index
-        *
-        * @param id
-        * @param index
-        * @return the property value
-        */
-       public String getString(PolicyPropertyInfo.PolicyPropertyId id, int index) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                       PolicyPropertyInfo.PropertyType.STRING,
-                                                       PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               return (String)propertyMap.get(key).getValue(index);
-       }
-
-       /**
-        * Get the number of string values for the specified property
-        *
-        * @param id
-        * @return the number of elements
-        */
-       public int getStringSize(PolicyPropertyInfo.PolicyPropertyId id) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                       PolicyPropertyInfo.PropertyType.STRING,
-                                                       PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               Value v = propertyMap.get(key);
-               return v.vl.size();
-       }
-
-       /**
-        * Get the reference-valued property for prop_name.
-        * @param id
-        * @return the property value
-        */
-       public PolicyReference getReference(PolicyPropertyInfo.PolicyPropertyId id) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                       PolicyPropertyInfo.PropertyType.REFERENCE,
-                                                       PolicyPropertyInfo.PropertyCardinality.SCALAR);
-               return (PolicyReference)propertyMap.get(key).getValue(0);
-       }
-
-       /**
-        * For a vector-valued reference property, get the specified property
-        * value at the specified index
-        *
-        * @param id
-        * @param index
-        * @return the property value
-        */
-       public PolicyReference getReference(PolicyPropertyInfo.PolicyPropertyId id, int index) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                       PolicyPropertyInfo.PropertyType.REFERENCE,
-                                                       PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               return (PolicyReference)propertyMap.get(key).getValue(index);
-       }
-
-       /**
-        * Get the number of reference values for the specified property
-        *
-        * @param id
-        * @return the number of elements
-        */
-       public int getReferenceSize(PolicyPropertyInfo.PolicyPropertyId id) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                       PolicyPropertyInfo.PropertyType.REFERENCE,
-                                                       PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               Value v = propertyMap.get(key);
-               return v.vl.size();
-       }
-
-       /**
-        * Get the MAC-address-valued property for prop_name.
-        *
-        * @param id
-        * @return the property value
-        */
-       public MacAddress getMacAddress(PolicyPropertyInfo.PolicyPropertyId id) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                       PolicyPropertyInfo.PropertyType.MAC,
-                                                       PolicyPropertyInfo.PropertyCardinality.SCALAR);
-               return (MacAddress)propertyMap.get(key).getValue(0);
-       }
-
-       /**
-        * For a vector-valued MAC address property, get the specified
-        * property value at the specified index
-        *
-        * @param id
-        * @param index
-        * @return the property value
-        */
-       public MacAddress getMacAddress(PolicyPropertyInfo.PolicyPropertyId id, int index) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                       PolicyPropertyInfo.PropertyType.MAC,
-                                                       PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               return (MacAddress)propertyMap.get(key).getValue(index);
-       }
-
-       /**
-        * Get the number of MAC address values for the specified
-        * property
-        *
-        * @param id
-        * @return the number of elements
-        */
-       public int getMacAddressSize(PolicyPropertyInfo.PolicyPropertyId id) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                       PolicyPropertyInfo.PropertyType.MAC,
-                                                       PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               Value v = propertyMap.get(key);
-               return v.vl.size();
-       }
-
-       // setters
-       /**
-        * Set the uint64-valued parameter to the specified value.
-        *
-        * @param id
-        * @param bi
-        */
-       public void setUint64(PolicyPropertyInfo.PolicyPropertyId id, BigInteger bi) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                               PolicyPropertyInfo.PropertyType.U64,
-                                                               PolicyPropertyInfo.PropertyCardinality.SCALAR);
-               Value v = propertyMap.get(key);
-               if (v == null) v = new Value(); propertyMap.put(key, v);
-
-               v.setPropertyType(PolicyPropertyInfo.PropertyType.U64);
-               v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
-               v.setValue(bi);
-       }
-
-       /**
-        * Set the uint64-vector-valued parameter to the specified value.
-        *
-        * @param id
-        * @param bil
-        */
-       public void setUint64(PolicyPropertyInfo.PolicyPropertyId id, List<BigInteger> bil) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                               PolicyPropertyInfo.PropertyType.U64,
-                                                               PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               Value v = propertyMap.get(key);
-               if (v == null) v = new Value(); propertyMap.put(key, v);
-
-               v.setPropertyType(PolicyPropertyInfo.PropertyType.U64);
-               v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               v.setValue(bil);
-
-       }
-
-       /**
-        * Set the int64-valued parameter to the specified value.
-        *
-        * @param id
-        * @param li
-        */
-       public void setInt64(PolicyPropertyInfo.PolicyPropertyId id, long li) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                               PolicyPropertyInfo.PropertyType.S64,
-                                                               PolicyPropertyInfo.PropertyCardinality.SCALAR);
-               Value v = propertyMap.get(key);
-               if (v == null) v = new Value(); propertyMap.put(key, v);
-
-               v.setPropertyType(PolicyPropertyInfo.PropertyType.S64);
-               v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
-               v.setValue(li);
-
-       }
-
-       /**
-        * Set the int64-vector-valued parameter to the specified value.
-        *
-        * @param id
-        * @param ll
-        */
-       public void setInt64(PolicyPropertyInfo.PolicyPropertyId id, List<Long> ll) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                               PolicyPropertyInfo.PropertyType.S64,
-                                                               PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               Value v = propertyMap.get(key);
-               if (v == null) v = new Value(); propertyMap.put(key, v);
-
-               v.setPropertyType(PolicyPropertyInfo.PropertyType.S64);
-               v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               v.setValue(ll);
-
-       }
-
-       /**
-        * Set the string-valued parameter to the specified value.
-        *
-        * @param id
-        * @param s
-        */
-       public void setString(PolicyPropertyInfo.PolicyPropertyId id, String s) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                               PolicyPropertyInfo.PropertyType.STRING,
-                                                               PolicyPropertyInfo.PropertyCardinality.SCALAR);
-               Value v = propertyMap.get(key);
-               if (v == null) v = new Value(); propertyMap.put(key, v);
-
-               v.setPropertyType(PolicyPropertyInfo.PropertyType.STRING);
-               v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
-               v.setValue(s);
-
-       }
-
-       /**
-        * Set the string-vector-valued parameter to the specified vector.
-        *
-        * @param id
-        * @param sl
-        */
-       public void setString(PolicyPropertyInfo.PolicyPropertyId id, List<String> sl) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                               PolicyPropertyInfo.PropertyType.STRING,
-                                                               PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               Value v = propertyMap.get(key);
-               if (v == null) v = new Value(); propertyMap.put(key, v);
-
-               v.setPropertyType(PolicyPropertyInfo.PropertyType.STRING);
-               v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               v.setValue(sl);
-
-       }
-
-       /**
-        * Set the reference-valued parameter to the specified value.
-        *
-        * @param id
-        * @param pr
-        */
-       public void setReference(PolicyPropertyInfo.PolicyPropertyId id, PolicyReference pr) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                               PolicyPropertyInfo.PropertyType.REFERENCE,
-                                                               PolicyPropertyInfo.PropertyCardinality.SCALAR);
-               Value v = propertyMap.get(key);
-               if (v == null) v = new Value(); propertyMap.put(key, v);
-
-               v.setPropertyType(PolicyPropertyInfo.PropertyType.REFERENCE);
-               v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
-               v.setValue(pr);
-
-       }
-
-       /**
-        * Set the reference-vector-valued parameter to the specified
-        * vector.
-        *
-        * @param id
-        * @param prl
-        */
-       public void setReference(PolicyPropertyInfo.PolicyPropertyId id, List<PolicyReference> prl) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                               PolicyPropertyInfo.PropertyType.REFERENCE,
-                                                               PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               Value v = propertyMap.get(key);
-               if (v == null) v = new Value(); propertyMap.put(key, v);
-
-               v.setPropertyType(PolicyPropertyInfo.PropertyType.REFERENCE);
-               v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               v.setValue(prl);
-
-       }
-
-       /**
-        * Set the MAC address-valued parameter to the specified value.
-        *
-        * @param id
-        * @param mac
-        */
-       public void setMacAddress(PolicyPropertyInfo.PolicyPropertyId id, MacAddress mac) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                               PolicyPropertyInfo.PropertyType.MAC,
-                                                               PolicyPropertyInfo.PropertyCardinality.SCALAR);
-               Value v = propertyMap.get(key);
-               if (v == null) v = new Value(); propertyMap.put(key, v);
-
-               v.setPropertyType(PolicyPropertyInfo.PropertyType.MAC);
-               v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
-               v.setValue(mac);
-
-       }
-
-       /**
-        * Set the MAC address-vector-valued parameter to the specified value.
-        *
-        * @param id
-        * @param macList
-        */
-       public void setMacAddress(PolicyPropertyInfo.PolicyPropertyId id, List<MacAddress> macList) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                               PolicyPropertyInfo.PropertyType.MAC,
-                                                               PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               Value v = propertyMap.get(key);
-               if (v == null) v = new Value(); propertyMap.put(key, v);
-
-               v.setPropertyType(PolicyPropertyInfo.PropertyType.MAC);
-               v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               v.setValue(macList);
-
-       }
-
-       /**
-        * Add a value to a the specified unsigned 64-bit vector.
-        *
-        * @param id
-        * @param bi
-        */
-       public void addUint64(PolicyPropertyInfo.PolicyPropertyId id, BigInteger bi) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                               PolicyPropertyInfo.PropertyType.U64,
-                                                               PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               Value v = propertyMap.get(key);
-               if (v == null)  {
-                       v = new Value();
-                       v.setPropertyType(PolicyPropertyInfo.PropertyType.U64);
-                       v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
-                       List<BigInteger> bil = new ArrayList<BigInteger>();
-                       v.setValue(bil);
-                       propertyMap.put(key, v);
-               }
-               v.vl.add(bi);
-       }
-
-       /**
-        * Add a value to a the specified signed 64-bit vector.
-        *
-        * @param id
-        * @param li
-        */
-       public void addInt64(PolicyPropertyInfo.PolicyPropertyId id, long li) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                               PolicyPropertyInfo.PropertyType.S64,
-                                                               PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               Value v = propertyMap.get(key);
-               if (v == null)  {
-                       v = new Value();
-                       v.setPropertyType(PolicyPropertyInfo.PropertyType.U64);
-                       v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
-                       List<Long> ll = new ArrayList<Long>();
-                       v.setValue(ll);
-                       propertyMap.put(key, v);
-               }
-               v.vl.add(li);
-       }
-
-       /**
-        * Add a value to a the specified string vector.
-        *
-        * @param id
-        * @param s
-        */
-       public void addString(PolicyPropertyInfo.PolicyPropertyId id, String s) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                               PolicyPropertyInfo.PropertyType.STRING,
-                                                               PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               Value v = propertyMap.get(key);
-               if (v == null)  {
-                       v = new Value();
-                       v.setPropertyType(PolicyPropertyInfo.PropertyType.STRING);
-                       v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
-                       List<String> sl = new ArrayList<String>();
-                       v.setValue(sl);
-                       propertyMap.put(key, v);
-               }
-               v.vl.add(s);
-       }
-
-       /**
-        * Add a value to a the specified reference vector.
-        *
-        * @param id
-        * @param pr
-        */
-       public void addReference(PolicyPropertyInfo.PolicyPropertyId id, PolicyReference pr) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                               PolicyPropertyInfo.PropertyType.REFERENCE,
-                                                               PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               Value v = propertyMap.get(key);
-               if (v == null)  {
-                       v = new Value();
-                       v.setPropertyType(PolicyPropertyInfo.PropertyType.REFERENCE);
-                       v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
-                       List<PolicyReference> prl = new ArrayList<PolicyReference>();
-                       v.setValue(prl);
-                       propertyMap.put(key, v);
-               }
-               v.vl.add(pr);
-
-       }
-
-       /**
-        * Add a value to a the specified MAC address vector.
-        *
-        * @param id
-        * @param mac
-        */
-       public void addMacAddress(PolicyPropertyInfo.PolicyPropertyId id, MacAddress mac) {
-               PropertyKey key =
-                               new PropertyKey(id,
-                                                               PolicyPropertyInfo.PropertyType.MAC,
-                                                               PolicyPropertyInfo.PropertyCardinality.VECTOR);
-               Value v = propertyMap.get(key);
-               if (v == null)  {
-                       v = new Value();
-                       v.setPropertyType(PolicyPropertyInfo.PropertyType.MAC);
-                       v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
-                       List<MacAddress> ml = new ArrayList<MacAddress>();
-                       v.setValue(ml);
-                       propertyMap.put(key, v);
-               }
-               v.vl.add(mac);
-
-       }
+    /**
+     * An object used as a key for the property hash map. It
+     * consists of the tuple: { {@link PolicyPropertyId}, {@link PolicyPropertyInfo.PropertyType},
+     * {@link PolicyPropertyInfo.Propertycardinality}
+     *
+     * @author tbachman
+     */
+    public static class PropertyKey {
+
+        private final PolicyPropertyId propId;
+        private final PolicyPropertyInfo.PropertyType type;
+        private final PolicyPropertyInfo.PropertyCardinality cardinality;
+
+        public PropertyKey(PolicyPropertyId propId, PolicyPropertyInfo.PropertyType type,
+                PolicyPropertyInfo.PropertyCardinality cardinality) {
+            this.propId = propId;
+            this.type = type;
+            this.cardinality = cardinality;
+        }
+
+        @Override
+        public int hashCode() {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + ((cardinality == null) ? 0 : cardinality.hashCode());
+            result = prime * result + ((propId == null) ? 0 : propId.hashCode());
+            result = prime * result + ((type == null) ? 0 : type.hashCode());
+            return result;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj)
+                return true;
+            if (obj == null)
+                return false;
+            if (getClass() != obj.getClass())
+                return false;
+            PropertyKey other = (PropertyKey) obj;
+            if (cardinality != other.cardinality)
+                return false;
+            if (propId == null) {
+                if (other.propId != null)
+                    return false;
+            } else if (!propId.equals(other.propId))
+                return false;
+            if (type != other.type)
+                return false;
+            return true;
+        }
+
+    }
+
+    /**
+     * Class that contains a value held by the {@link PolicyObjectInstance}.
+     * The value can be scalar or vector in nature.
+     *
+     * @author tbachman
+     */
+    public static class Value {
+
+        private Object v;
+        private List<Object> vl;
+        private PolicyPropertyInfo.PropertyType type;
+        private PolicyPropertyInfo.PropertyCardinality cardinality;
+
+        public void setPropertyType(PolicyPropertyInfo.PropertyType type) {
+            this.type = type;
+        }
+
+        public void setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality cardinality) {
+            this.cardinality = cardinality;
+        }
+
+        public void setValue(Object v) {
+            this.v = v;
+        }
+
+        public void setValue(List<Object> vl) {
+            this.vl = vl;
+        }
+
+        public Object getValue(int index) {
+            if (this.cardinality == PolicyPropertyInfo.PropertyCardinality.VECTOR) {
+                return this.vl.get(index);
+            } else {
+                return this.v;
+            }
+        }
+
+        public PolicyPropertyInfo.PropertyType getType() {
+            return this.type;
+        }
+    }
+
+    /**
+     * Class used as a reference to another PolicyObject.
+     *
+     * @author tbachman
+     */
+    public static class PolicyReference {
+
+        private final Uri uri;
+        private final long classId;
+
+        public PolicyReference(long classId, Uri uri) {
+            this.uri = uri;
+            this.classId = classId;
+        }
+
+        public Uri getUri() {
+            return this.uri;
+        }
+
+        public long getClassId() {
+            return this.classId;
+        }
+
+        @Override
+        public int hashCode() {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + (int) (classId ^ (classId >>> 32));
+            result = prime * result + ((uri == null) ? 0 : uri.hashCode());
+            return result;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj)
+                return true;
+            if (obj == null)
+                return false;
+            if (getClass() != obj.getClass())
+                return false;
+            PolicyReference other = (PolicyReference) obj;
+            if (classId != other.classId)
+                return false;
+            if (uri == null) {
+                if (other.uri != null)
+                    return false;
+            } else if (!uri.equals(other.uri))
+                return false;
+            return true;
+        }
+
+    }
+
+    private long classId;
+    private Uri uri;
+    private Uri parentUri;
+    private String parentSubject;
+    private String parentRelation;
+    private List<Uri> children;
+    private HashMap<PropertyKey, Value> propertyMap;
+
+    private PolicyPropertyInfo.PropertyType normalize(PolicyPropertyInfo.PropertyType type) {
+        switch (type) {
+            case ENUM8:
+            case ENUM16:
+            case ENUM32:
+            case ENUM64:
+                return PolicyPropertyInfo.PropertyType.U64;
+            default:
+                return type;
+        }
+    }
+
+    public PolicyObjectInstance(long classId) {
+        this.classId = classId;
+        this.children = new ArrayList<Uri>();
+        this.propertyMap = new HashMap<PropertyKey, Value>();
+    }
+
+    /**
+     * Get the class ID for this object instance.
+     *
+     * @return the class ID
+     */
+    public long getClassId() {
+        return this.classId;
+    }
+
+    public Uri getUri() {
+        return uri;
+    }
+
+    public void setUri(Uri uri) {
+        this.uri = uri;
+    }
+
+    public void addChild(Uri childUri) {
+        children.add(childUri);
+    }
+
+    public List<Uri> getChildren() {
+        return this.children;
+    }
+
+    public void setParent(Uri uri) {
+        this.parentUri = uri;
+    }
+
+    public Uri getParent() {
+        return this.parentUri;
+    }
+
+    public void setParentSubject(String subject) {
+        this.parentSubject = subject;
+    }
+
+    public String getParentSubject() {
+        return this.parentSubject;
+    }
+
+    public void setParentRelation(String relation) {
+        this.parentRelation = relation;
+    }
+
+    public String getParentRelation() {
+        return this.parentRelation;
+    }
+
+    /**
+     * Check whether the given property is set. If the property is
+     * vector-valued, this will return false if the vector is zero length
+     *
+     * @param propId
+     * @param type
+     * @param cardinality
+     * @return true if set, false if not set or zero length vector
+     */
+    public boolean isSet(PolicyPropertyInfo.PolicyPropertyId propId, PolicyPropertyInfo.PropertyType type,
+            PolicyPropertyInfo.PropertyCardinality cardinality) {
+        type = normalize(type);
+        PropertyKey key = new PropertyKey(propId, type, cardinality);
+        return propertyMap.containsKey(key);
+    }
+
+    /**
+     * Unset the given property. If it's a vector, the vector is
+     * emptied. If its a scalar, the scalar is unset.
+     *
+     * @param propId
+     * @param type
+     * @param cardinality
+     * @return true if the property was alread set before
+     */
+    public boolean unset(PolicyPropertyInfo.PolicyPropertyId propId, PolicyPropertyInfo.PropertyType type,
+            PolicyPropertyInfo.PropertyCardinality cardinality) {
+        type = normalize(type);
+        PropertyKey key = new PropertyKey(propId, type, cardinality);
+        Value v = propertyMap.remove(key);
+        if (v == null)
+            return false;
+        return true;
+    }
+
+    // getters
+
+    /**
+     * Get the unsigned 64-bit valued property for prop_name.
+     *
+     * @param id
+     * @return null if not present or {@link BigInteger}
+     */
+    public BigInteger getUint64(PolicyPropertyInfo.PolicyPropertyId id) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.U64,
+                PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        return (BigInteger) propertyMap.get(key).getValue(0);
+    }
+
+    /**
+     * For a vector-valued 64-bit unsigned property, get the specified
+     * property value at the specified index
+     *
+     * @param id
+     * @param index
+     * @return the property value
+     */
+    public BigInteger getUint64(PolicyPropertyInfo.PolicyPropertyId id, int index) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.U64,
+                PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        return (BigInteger) propertyMap.get(key).getValue(index);
+    }
+
+    /**
+     * Get the number of unsigned 64-bit values for the specified
+     * property
+     *
+     * @param id
+     * @return the number of elements
+     */
+    public int getUint64Size(PolicyPropertyInfo.PolicyPropertyId id) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.U64,
+                PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        Value v = propertyMap.get(key);
+        return v.vl.size();
+    }
+
+    /**
+     * Get the signed 64-bit valued property for prop_name.
+     *
+     * @param id
+     * @return the property value
+     */
+    public long getInt64(PolicyPropertyInfo.PolicyPropertyId id) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.S64,
+                PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        return (long) propertyMap.get(key).getValue(0);
+    }
+
+    /**
+     * For a vector-valued 64-bit signed property, get the specified
+     * property value at the specified index
+     *
+     * @param id
+     * @param index
+     * @return the property value
+     */
+    public long getInt64(PolicyPropertyInfo.PolicyPropertyId id, int index) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.S64,
+                PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        return (long) propertyMap.get(key).getValue(index);
+    }
+
+    /**
+     * Get the number of signed 64-bit values for the specified
+     * property
+     *
+     * @param id
+     * @return the number of elements
+     */
+    public int getInt64Size(PolicyPropertyInfo.PolicyPropertyId id) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.S64,
+                PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        Value v = propertyMap.get(key);
+        return v.vl.size();
+    }
+
+    /**
+     * Get the string-valued property for prop_name.
+     *
+     * @param id
+     * @return the property value
+     */
+    public String getString(PolicyPropertyInfo.PolicyPropertyId id) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.STRING,
+                PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        return (String) propertyMap.get(key).getValue(0);
+    }
+
+    /**
+     * For a vector-valued string property, get the specified property
+     * value at the specified index
+     *
+     * @param id
+     * @param index
+     * @return the property value
+     */
+    public String getString(PolicyPropertyInfo.PolicyPropertyId id, int index) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.STRING,
+                PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        return (String) propertyMap.get(key).getValue(index);
+    }
+
+    /**
+     * Get the number of string values for the specified property
+     *
+     * @param id
+     * @return the number of elements
+     */
+    public int getStringSize(PolicyPropertyInfo.PolicyPropertyId id) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.STRING,
+                PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        Value v = propertyMap.get(key);
+        return v.vl.size();
+    }
+
+    /**
+     * Get the reference-valued property for prop_name.
+     * 
+     * @param id
+     * @return the property value
+     */
+    public PolicyReference getReference(PolicyPropertyInfo.PolicyPropertyId id) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.REFERENCE,
+                PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        return (PolicyReference) propertyMap.get(key).getValue(0);
+    }
+
+    /**
+     * For a vector-valued reference property, get the specified property
+     * value at the specified index
+     *
+     * @param id
+     * @param index
+     * @return the property value
+     */
+    public PolicyReference getReference(PolicyPropertyInfo.PolicyPropertyId id, int index) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.REFERENCE,
+                PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        return (PolicyReference) propertyMap.get(key).getValue(index);
+    }
+
+    /**
+     * Get the number of reference values for the specified property
+     *
+     * @param id
+     * @return the number of elements
+     */
+    public int getReferenceSize(PolicyPropertyInfo.PolicyPropertyId id) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.REFERENCE,
+                PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        Value v = propertyMap.get(key);
+        return v.vl.size();
+    }
+
+    /**
+     * Get the MAC-address-valued property for prop_name.
+     *
+     * @param id
+     * @return the property value
+     */
+    public MacAddress getMacAddress(PolicyPropertyInfo.PolicyPropertyId id) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.MAC,
+                PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        return (MacAddress) propertyMap.get(key).getValue(0);
+    }
+
+    /**
+     * For a vector-valued MAC address property, get the specified
+     * property value at the specified index
+     *
+     * @param id
+     * @param index
+     * @return the property value
+     */
+    public MacAddress getMacAddress(PolicyPropertyInfo.PolicyPropertyId id, int index) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.MAC,
+                PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        return (MacAddress) propertyMap.get(key).getValue(index);
+    }
+
+    /**
+     * Get the number of MAC address values for the specified
+     * property
+     *
+     * @param id
+     * @return the number of elements
+     */
+    public int getMacAddressSize(PolicyPropertyInfo.PolicyPropertyId id) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.MAC,
+                PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        Value v = propertyMap.get(key);
+        return v.vl.size();
+    }
+
+    // setters
+    /**
+     * Set the uint64-valued parameter to the specified value.
+     *
+     * @param id
+     * @param bi
+     */
+    public void setUint64(PolicyPropertyInfo.PolicyPropertyId id, BigInteger bi) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.U64,
+                PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        Value v = propertyMap.get(key);
+        if (v == null)
+            v = new Value();
+        propertyMap.put(key, v);
+
+        v.setPropertyType(PolicyPropertyInfo.PropertyType.U64);
+        v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        v.setValue(bi);
+    }
+
+    /**
+     * Set the uint64-vector-valued parameter to the specified value.
+     *
+     * @param id
+     * @param bil
+     */
+    public void setUint64(PolicyPropertyInfo.PolicyPropertyId id, List<BigInteger> bil) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.U64,
+                PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        Value v = propertyMap.get(key);
+        if (v == null)
+            v = new Value();
+        propertyMap.put(key, v);
+
+        v.setPropertyType(PolicyPropertyInfo.PropertyType.U64);
+        v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        v.setValue(bil);
+
+    }
+
+    /**
+     * Set the int64-valued parameter to the specified value.
+     *
+     * @param id
+     * @param li
+     */
+    public void setInt64(PolicyPropertyInfo.PolicyPropertyId id, long li) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.S64,
+                PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        Value v = propertyMap.get(key);
+        if (v == null)
+            v = new Value();
+        propertyMap.put(key, v);
+
+        v.setPropertyType(PolicyPropertyInfo.PropertyType.S64);
+        v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        v.setValue(li);
+
+    }
+
+    /**
+     * Set the int64-vector-valued parameter to the specified value.
+     *
+     * @param id
+     * @param ll
+     */
+    public void setInt64(PolicyPropertyInfo.PolicyPropertyId id, List<Long> ll) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.S64,
+                PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        Value v = propertyMap.get(key);
+        if (v == null)
+            v = new Value();
+        propertyMap.put(key, v);
+
+        v.setPropertyType(PolicyPropertyInfo.PropertyType.S64);
+        v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        v.setValue(ll);
+
+    }
+
+    /**
+     * Set the string-valued parameter to the specified value.
+     *
+     * @param id
+     * @param s
+     */
+    public void setString(PolicyPropertyInfo.PolicyPropertyId id, String s) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.STRING,
+                PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        Value v = propertyMap.get(key);
+        if (v == null)
+            v = new Value();
+        propertyMap.put(key, v);
+
+        v.setPropertyType(PolicyPropertyInfo.PropertyType.STRING);
+        v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        v.setValue(s);
+
+    }
+
+    /**
+     * Set the string-vector-valued parameter to the specified vector.
+     *
+     * @param id
+     * @param sl
+     */
+    public void setString(PolicyPropertyInfo.PolicyPropertyId id, List<String> sl) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.STRING,
+                PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        Value v = propertyMap.get(key);
+        if (v == null)
+            v = new Value();
+        propertyMap.put(key, v);
+
+        v.setPropertyType(PolicyPropertyInfo.PropertyType.STRING);
+        v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        v.setValue(sl);
+
+    }
+
+    /**
+     * Set the reference-valued parameter to the specified value.
+     *
+     * @param id
+     * @param pr
+     */
+    public void setReference(PolicyPropertyInfo.PolicyPropertyId id, PolicyReference pr) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.REFERENCE,
+                PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        Value v = propertyMap.get(key);
+        if (v == null)
+            v = new Value();
+        propertyMap.put(key, v);
+
+        v.setPropertyType(PolicyPropertyInfo.PropertyType.REFERENCE);
+        v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        v.setValue(pr);
+
+    }
+
+    /**
+     * Set the reference-vector-valued parameter to the specified
+     * vector.
+     *
+     * @param id
+     * @param prl
+     */
+    public void setReference(PolicyPropertyInfo.PolicyPropertyId id, List<PolicyReference> prl) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.REFERENCE,
+                PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        Value v = propertyMap.get(key);
+        if (v == null)
+            v = new Value();
+        propertyMap.put(key, v);
+
+        v.setPropertyType(PolicyPropertyInfo.PropertyType.REFERENCE);
+        v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        v.setValue(prl);
+
+    }
+
+    /**
+     * Set the MAC address-valued parameter to the specified value.
+     *
+     * @param id
+     * @param mac
+     */
+    public void setMacAddress(PolicyPropertyInfo.PolicyPropertyId id, MacAddress mac) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.MAC,
+                PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        Value v = propertyMap.get(key);
+        if (v == null)
+            v = new Value();
+        propertyMap.put(key, v);
+
+        v.setPropertyType(PolicyPropertyInfo.PropertyType.MAC);
+        v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.SCALAR);
+        v.setValue(mac);
+
+    }
+
+    /**
+     * Set the MAC address-vector-valued parameter to the specified value.
+     *
+     * @param id
+     * @param macList
+     */
+    public void setMacAddress(PolicyPropertyInfo.PolicyPropertyId id, List<MacAddress> macList) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.MAC,
+                PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        Value v = propertyMap.get(key);
+        if (v == null)
+            v = new Value();
+        propertyMap.put(key, v);
+
+        v.setPropertyType(PolicyPropertyInfo.PropertyType.MAC);
+        v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        v.setValue(macList);
+
+    }
+
+    /**
+     * Add a value to a the specified unsigned 64-bit vector.
+     *
+     * @param id
+     * @param bi
+     */
+    public void addUint64(PolicyPropertyInfo.PolicyPropertyId id, BigInteger bi) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.U64,
+                PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        Value v = propertyMap.get(key);
+        if (v == null) {
+            v = new Value();
+            v.setPropertyType(PolicyPropertyInfo.PropertyType.U64);
+            v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+            List<BigInteger> bil = new ArrayList<BigInteger>();
+            v.setValue(bil);
+            propertyMap.put(key, v);
+        }
+        v.vl.add(bi);
+    }
+
+    /**
+     * Add a value to a the specified signed 64-bit vector.
+     *
+     * @param id
+     * @param li
+     */
+    public void addInt64(PolicyPropertyInfo.PolicyPropertyId id, long li) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.S64,
+                PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        Value v = propertyMap.get(key);
+        if (v == null) {
+            v = new Value();
+            v.setPropertyType(PolicyPropertyInfo.PropertyType.U64);
+            v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+            List<Long> ll = new ArrayList<Long>();
+            v.setValue(ll);
+            propertyMap.put(key, v);
+        }
+        v.vl.add(li);
+    }
+
+    /**
+     * Add a value to a the specified string vector.
+     *
+     * @param id
+     * @param s
+     */
+    public void addString(PolicyPropertyInfo.PolicyPropertyId id, String s) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.STRING,
+                PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        Value v = propertyMap.get(key);
+        if (v == null) {
+            v = new Value();
+            v.setPropertyType(PolicyPropertyInfo.PropertyType.STRING);
+            v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+            List<String> sl = new ArrayList<String>();
+            v.setValue(sl);
+            propertyMap.put(key, v);
+        }
+        v.vl.add(s);
+    }
+
+    /**
+     * Add a value to a the specified reference vector.
+     *
+     * @param id
+     * @param pr
+     */
+    public void addReference(PolicyPropertyInfo.PolicyPropertyId id, PolicyReference pr) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.REFERENCE,
+                PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        Value v = propertyMap.get(key);
+        if (v == null) {
+            v = new Value();
+            v.setPropertyType(PolicyPropertyInfo.PropertyType.REFERENCE);
+            v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+            List<PolicyReference> prl = new ArrayList<PolicyReference>();
+            v.setValue(prl);
+            propertyMap.put(key, v);
+        }
+        v.vl.add(pr);
+
+    }
+
+    /**
+     * Add a value to a the specified MAC address vector.
+     *
+     * @param id
+     * @param mac
+     */
+    public void addMacAddress(PolicyPropertyInfo.PolicyPropertyId id, MacAddress mac) {
+        PropertyKey key = new PropertyKey(id, PolicyPropertyInfo.PropertyType.MAC,
+                PolicyPropertyInfo.PropertyCardinality.VECTOR);
+        Value v = propertyMap.get(key);
+        if (v == null) {
+            v = new Value();
+            v.setPropertyType(PolicyPropertyInfo.PropertyType.MAC);
+            v.setPropertyCardinality(PolicyPropertyInfo.PropertyCardinality.VECTOR);
+            List<MacAddress> ml = new ArrayList<MacAddress>();
+            v.setValue(ml);
+            propertyMap.put(key, v);
+        }
+        v.vl.add(mac);
+
+    }
 }
index 16e5f41d81e7f5167c6f0f91b6172ebd30496b49..7b7fa2353c0c7f1c540f38e57a825c0ee79e8f39 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
+ * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
 
 package org.opendaylight.groupbasedpolicy.renderer.opflex.mit;
 
-
 /**
  * Class containing metadata used to describe
  * properties contained by an OpFlex Managed Object
  *
  * @author tbachman
- *
  */
 public interface PolicyPropertyInfo {
-       /**
-        * enum that represents possible Property types
-        *
-        * @author tbachman
-        *
-        */
-       static public enum PropertyType {
-               COMPOSITE("composite"),
-               REFERENCE("reference"),
-               STRING("string"),
-               S64("s64"),
-               U64("u64"),
-               MAC("mac"),
-               ENUM8("enum8"),
-               ENUM16("enum16"),
-               ENUM32("enum32"),
-               ENUM64("enum64");
-
-               private final String type;
-
-               PropertyType(String type) {
-                       this.type = type;
-               }
-
-               @Override
-               public String toString() {
-                       return this.type;
-               }
-       }
-
-       /**
-        * enum that represents the possible cardinalities of a Property
-        *
-        * @author tbachman
-        *
-        */
-       static public enum PropertyCardinality {
-               SCALAR("scalar"),
-               VECTOR("vector");
-
-               private final String cardinality;
-
-               PropertyCardinality(String cardinality) {
-                       this.cardinality = cardinality;
-               }
-
-               @Override
-               public String toString() {
-                       return this.cardinality;
-               }
-       }
-
-       /**
-        * The unique local ID assigned to this Property
-        *
-        * @author tbachman
-        *
-        */
-       static public class PolicyPropertyId {
-               private final long propertyId;
-               public PolicyPropertyId(long propertyId) {
-                       this.propertyId = propertyId;
-               }
-               public long getPropertyId() {
-                       return propertyId;
-               }
-               @Override
-               public int hashCode() {
-                       final int prime = 31;
-                       int result = 1;
-                       result = prime * result + (int) (propertyId ^ (propertyId >>> 32));
-                       return result;
-               }
-               @Override
-               public boolean equals(Object obj) {
-                       if (this == obj)
-                               return true;
-                       if (obj == null)
-                               return false;
-                       if (getClass() != obj.getClass())
-                               return false;
-                       PolicyPropertyId other = (PolicyPropertyId) obj;
-                       if (propertyId != other.propertyId)
-                               return false;
-                       return true;
-               }
-
-       }
-
-       public static class PolicyPropertyInfoBuilder {
-               private long classId;
-               private PropertyType type;
-               private PolicyPropertyId propId;
-               private PropertyCardinality propCardinality;
-               private String propName;
-               private EnumInfo enumInfo;
-
-               public PolicyPropertyInfoBuilder setClassId(long classId) {
-                       this.classId = classId;
-                       return this;
-               }
-
-               public PolicyPropertyInfoBuilder setType(PropertyType type) {
-                       this.type = type;
-                       return this;
-               }
-
-               public PolicyPropertyInfoBuilder setPropId(PolicyPropertyId propId) {
-                       this.propId = propId;
-                       return this;
-               }
-
-               public PolicyPropertyInfoBuilder setPropCardinality(PropertyCardinality propCardinality) {
-                       this.propCardinality = propCardinality;
-                       return this;
-               }
-
-               public PolicyPropertyInfoBuilder setPropName(String propName) {
-                       this.propName = propName;
-                       return this;
-               }
-
-               public PolicyPropertyInfoBuilder setEnumInfo(EnumInfo enumInfo) {
-                       this.enumInfo = enumInfo;
-                       return this;
-               }
-
-               public PolicyPropertyInfo build() {
-                       return new PolicyPropertyInfoImpl(this);
-               }
-
-               private static final class PolicyPropertyInfoImpl implements PolicyPropertyInfo {
-                       /*
-                        * The classId is only used in COMPOSITE properties
-                        */
-                       private final long classId;
-                       private final PropertyType type;
-                       private final PolicyPropertyId propId;
-                       private final PropertyCardinality propCardinality;
-                       private final String propName;
-                       private final EnumInfo enumInfo;
-
-                       public PolicyPropertyInfoImpl(PolicyPropertyInfoBuilder builder) {
-                               this.classId = builder.classId;
-                               this.type = builder.type;
-                               this.propId = builder.propId;
-                               this.propCardinality = builder.propCardinality;
-                               this.propName = builder.propName;
-                               this.enumInfo = builder.enumInfo;
-
-                       }
-                       @Override
-                       public long getClassId() {
-                               return classId;
-                       }
-
-                       @Override
-                       public PropertyType getType() {
-                               return type;
-                       }
-
-                       @Override
-                       public PolicyPropertyId getPropId() {
-                               return propId;
-                       }
-
-                       @Override
-                       public PropertyCardinality getPropCardinality() {
-                               return propCardinality;
-                       }
-
-                       @Override
-                       public String getPropName() {
-                               return propName;
-                       }
-
-                       @Override
-                       public EnumInfo getEnumInfo() {
-                               return enumInfo;
-                       }
-               }
-
-       }
-
-       /**
-        * Get the class of the {@link PolicyPropertyInfo} object
-        *
-        * @return
-        */
-       public long getClassId();
-
-       /**
-        * Get the type of the {@link PolicyPropertyInfo} object
-        *
-        * @return
-        */
-       public PropertyType getType();
-
-       /**
-        * Get the ID of the {@link PolicyPropertyInfo} object
-        *
-        * @return
-        */
-       public PolicyPropertyId getPropId();
-
-       /**
-        * Get the cardinality of the {@link PolicyPropertyInfo} object
-        *
-        * @return
-        */
-       public PropertyCardinality getPropCardinality();
-
-       /**
-        * Get the name of the {@link PolicyPropertyInfo} object
-        *
-        * @return
-        */
-       public String getPropName();
-
-       /**
-        * Get the {@link EnumInfo} object for the {@link PolicyPropertyInfo}
-        * object, if present
-        *
-        * @return
-        */
-       public EnumInfo getEnumInfo();
+
+    /**
+     * enum that represents possible Property types
+     *
+     * @author tbachman
+     */
+    static public enum PropertyType {
+        COMPOSITE("composite"), REFERENCE("reference"), STRING("string"), S64("s64"), U64("u64"), MAC("mac"), ENUM8(
+                "enum8"), ENUM16("enum16"), ENUM32("enum32"), ENUM64("enum64");
+
+        private final String type;
+
+        PropertyType(String type) {
+            this.type = type;
+        }
+
+        @Override
+        public String toString() {
+            return this.type;
+        }
+    }
+
+    /**
+     * enum that represents the possible cardinalities of a Property
+     *
+     * @author tbachman
+     */
+    static public enum PropertyCardinality {
+        SCALAR("scalar"), VECTOR("vector");
+
+        private final String cardinality;
+
+        PropertyCardinality(String cardinality) {
+            this.cardinality = cardinality;
+        }
+
+        @Override
+        public String toString() {
+            return this.cardinality;
+        }
+    }
+
+    /**
+     * The unique local ID assigned to this Property
+     *
+     * @author tbachman
+     */
+    static public class PolicyPropertyId {
+
+        private final long propertyId;
+
+        public PolicyPropertyId(long propertyId) {
+            this.propertyId = propertyId;
+        }
+
+        public long getPropertyId() {
+            return propertyId;
+        }
+
+        @Override
+        public int hashCode() {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + (int) (propertyId ^ (propertyId >>> 32));
+            return result;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj)
+                return true;
+            if (obj == null)
+                return false;
+            if (getClass() != obj.getClass())
+                return false;
+            PolicyPropertyId other = (PolicyPropertyId) obj;
+            if (propertyId != other.propertyId)
+                return false;
+            return true;
+        }
+
+    }
+
+    public static class PolicyPropertyInfoBuilder {
+
+        private long classId;
+        private PropertyType type;
+        private PolicyPropertyId propId;
+        private PropertyCardinality propCardinality;
+        private String propName;
+        private EnumInfo enumInfo;
+
+        public PolicyPropertyInfoBuilder setClassId(long classId) {
+            this.classId = classId;
+            return this;
+        }
+
+        public PolicyPropertyInfoBuilder setType(PropertyType type) {
+            this.type = type;
+            return this;
+        }
+
+        public PolicyPropertyInfoBuilder setPropId(PolicyPropertyId propId) {
+            this.propId = propId;
+            return this;
+        }
+
+        public PolicyPropertyInfoBuilder setPropCardinality(PropertyCardinality propCardinality) {
+            this.propCardinality = propCardinality;
+            return this;
+        }
+
+        public PolicyPropertyInfoBuilder setPropName(String propName) {
+            this.propName = propName;
+            return this;
+        }
+
+        public PolicyPropertyInfoBuilder setEnumInfo(EnumInfo enumInfo) {
+            this.enumInfo = enumInfo;
+            return this;
+        }
+
+        public PolicyPropertyInfo build() {
+            return new PolicyPropertyInfoImpl(this);
+        }
+
+        private static final class PolicyPropertyInfoImpl implements PolicyPropertyInfo {
+
+            /*
+             * The classId is only used in COMPOSITE properties
+             */
+            private final long classId;
+            private final PropertyType type;
+            private final PolicyPropertyId propId;
+            private final PropertyCardinality propCardinality;
+            private final String propName;
+            private final EnumInfo enumInfo;
+
+            public PolicyPropertyInfoImpl(PolicyPropertyInfoBuilder builder) {
+                this.classId = builder.classId;
+                this.type = builder.type;
+                this.propId = builder.propId;
+                this.propCardinality = builder.propCardinality;
+                this.propName = builder.propName;
+                this.enumInfo = builder.enumInfo;
+
+            }
+
+            @Override
+            public long getClassId() {
+                return classId;
+            }
+
+            @Override
+            public PropertyType getType() {
+                return type;
+            }
+
+            @Override
+            public PolicyPropertyId getPropId() {
+                return propId;
+            }
+
+            @Override
+            public PropertyCardinality getPropCardinality() {
+                return propCardinality;
+            }
+
+            @Override
+            public String getPropName() {
+                return propName;
+            }
+
+            @Override
+            public EnumInfo getEnumInfo() {
+                return enumInfo;
+            }
+        }
+
+    }
+
+    /**
+     * Get the class of the {@link PolicyPropertyInfo} object
+     *
+     * @return
+     */
+    public long getClassId();
+
+    /**
+     * Get the type of the {@link PolicyPropertyInfo} object
+     *
+     * @return
+     */
+    public PropertyType getType();
+
+    /**
+     * Get the ID of the {@link PolicyPropertyInfo} object
+     *
+     * @return
+     */
+    public PolicyPropertyId getPropId();
+
+    /**
+     * Get the cardinality of the {@link PolicyPropertyInfo} object
+     *
+     * @return
+     */
+    public PropertyCardinality getPropCardinality();
+
+    /**
+     * Get the name of the {@link PolicyPropertyInfo} object
+     *
+     * @return
+     */
+    public String getPropName();
+
+    /**
+     * Get the {@link EnumInfo} object for the {@link PolicyPropertyInfo} object, if present
+     *
+     * @return
+     */
+    public EnumInfo getEnumInfo();
 
 }
index f17dfd5fa710c500df7e4191dae432c6afecd8ba..471fc5be953cce940edf4bd44341ac0a17ba7c1f 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2014 Cisco Systems, Inc.
- *
+ * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Authors : Thomas Bachman
  */
 
@@ -17,129 +17,123 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 
 /**
  * Class used for building and extending URIs
- *
  * Returning the URI could be optimized by building this
  * as we go, rather than building it when requested.
- *
  * This counts and levels used in this class are for
  * the level of hierarchy, and do not include any
  * separator characters ("/"). For example, the following
  * URI:
- *
- *   /tenants/tenant/51134b1e-6047-4d51-8d07-4135afd3672f
- *
+ * /tenants/tenant/51134b1e-6047-4d51-8d07-4135afd3672f
  * has 3 levels.
  *
  * @author tbachman
- *
  */
 public class PolicyUri {
 
-       public final static String POLICY_URI_SEP = "/";
-
-       private List<String> uri;
-
-       public PolicyUri() {
-               uri = new ArrayList<String>();
-       }
-
-       /**
-        * Copy Constructor
-        *
-        * @param policyUri
-        */
-       public PolicyUri(PolicyUri policyUri) {
-               this.uri = new ArrayList<String>(policyUri.uri);
-       }
-
-       /**
-        * Constructor using a full string, which gets split
-        * into it's elements.
-        *
-        * @param uri
-        */
-       public PolicyUri(String uri) {
-        String [] tmpUri = uri.split(PolicyUri.POLICY_URI_SEP);
+    public final static String POLICY_URI_SEP = "/";
+
+    private List<String> uri;
+
+    public PolicyUri() {
+        uri = new ArrayList<String>();
+    }
+
+    /**
+     * Copy Constructor
+     *
+     * @param policyUri
+     */
+    public PolicyUri(PolicyUri policyUri) {
+        this.uri = new ArrayList<String>(policyUri.uri);
+    }
+
+    /**
+     * Constructor using a full string, which gets split
+     * into it's elements.
+     *
+     * @param uri
+     */
+    public PolicyUri(String uri) {
+        String[] tmpUri = uri.split(PolicyUri.POLICY_URI_SEP);
         if (tmpUri.length > 0) {
-               this.uri = new ArrayList<String>();
+            this.uri = new ArrayList<String>();
             // gets rid of leading empty element
-               for (int i = 1; i < tmpUri.length; i++) {
-                       this.push(tmpUri[i]);
-               }
-        }
-        else {
+            for (int i = 1; i < tmpUri.length; i++) {
+                this.push(tmpUri[i]);
+            }
+        } else {
             this.uri = null;
         }
-       }
-
-       /**
-        * Constructor using a list of URI elements, which
-        * excludes separator characters
-        *
-        * @param tokens
-        */
-       public PolicyUri(List<String> tokens) {
-               if (tokens.size() > 0) {
-                       this.uri = new ArrayList<String>();
-                       for (String t: tokens) {
-                               this.push(t);
-                       }
-               }
-       }
-
-       /**
-        * Return the URI as a Uri object, including
-        * separator characters
-        *
-        * @return
-        */
-       public Uri getUri() {
-               return new Uri(this.toString());
-       }
-
-       /**
-        * Push a new leaf on to the URI
-        *
-        * @param leaf
-        */
-       public void push(String leaf) {
-               uri.add(POLICY_URI_SEP);
-               uri.add(leaf);
-       }
-
-       /**
-        * Returns the String representation of parent object URI
-        *
-        * @return
-        */
-       public String getParent() {
-               if (uri.size() == 0) return null;
-
-               PolicyUri parentUri = new PolicyUri(this);
-               parentUri.pop();
-               return parentUri.toString();
-
-       }
-
-       /**
-        * Remove (and return) the leaf of the URI.
-        * Never pop off the "/" root element.
-        *
-        * @return
-        */
-       public String pop() {
-               if (uri.size() <= 0) {
-                       return null;
-               }
-               else {
-                       // remove the node
-                       String s = uri.remove(uri.size()-1);
-                       // remove the separator
-                       uri.remove(uri.size()-1);
-                       // return just the node
-                       return s;
-               }
-       }
+    }
+
+    /**
+     * Constructor using a list of URI elements, which
+     * excludes separator characters
+     *
+     * @param tokens
+     */
+    public PolicyUri(List<String> tokens) {
+        if (tokens.size() > 0) {
+            this.uri = new ArrayList<String>();
+            for (String t : tokens) {
+                this.push(t);
+            }
+        }
+    }
+
+    /**
+     * Return the URI as a Uri object, including
+     * separator characters
+     *
+     * @return
+     */
+    public Uri getUri() {
+        return new Uri(this.toString());
+    }
+
+    /**
+     * Push a new leaf on to the URI
+     *
+     * @param leaf
+     */
+    public void push(String leaf) {
+        uri.add(POLICY_URI_SEP);
+        uri.add(leaf);
+    }
+
+    /**
+     * Returns the String representation of parent object URI
+     *
+     * @return
+     */
+    public String getParent() {
+        if (uri.size() == 0)
+            return null;
+
+        PolicyUri parentUri = new PolicyUri(this);
+        parentUri.pop();
+        return parentUri.toString();
+
+    }
+
+    /**
+     * Remove (and return) the leaf of the URI.
+     * Never pop off the "/" root element.
+     *
+     * @return
+     */
+    public String pop() {
+        if (uri.size() <= 0) {
+            return null;
+        } else {
+            // remove the node
+            String s = uri.remove(uri.size() - 1);
+            // remove the separator
+            uri.remove(uri.size() - 1);
+            // return just the node
+            return s;
+        }
+    }
 
     /**
      * Determine if the URI is valid.
@@ -153,7 +147,6 @@ public class PolicyUri {
         return false;
     }
 
-
     /**
      * Get the element at depth "level". Returns
      * null if level exceeds the hierarchy depth.
@@ -162,9 +155,10 @@ public class PolicyUri {
      * @return
      */
     public String getElement(int level) {
-       if ((level*2+1) > this.uri.size()) return null;
+        if ((level * 2 + 1) > this.uri.size())
+            return null;
 
-       return this.uri.get(level*2+1);
+        return this.uri.get(level * 2 + 1);
     }
 
     /**
@@ -176,7 +170,7 @@ public class PolicyUri {
      * @return
      */
     public int whichElement(String needle) {
-       return (this.uri.indexOf(needle)/2);
+        return (this.uri.indexOf(needle) / 2);
     }
 
     /**
@@ -186,7 +180,7 @@ public class PolicyUri {
      * @return
      */
     public int totalElements() {
-       return (this.uri.size()/2);
+        return (this.uri.size() / 2);
     }
 
     /**
@@ -197,46 +191,47 @@ public class PolicyUri {
      * @return
      */
     public boolean contains(String needle) {
-       return this.uri.contains(needle);
+        return this.uri.contains(needle);
     }
 
     public String originalPath() {
-       return this.toString();
-    }
-
-       @Override
-       public int hashCode() {
-               final int prime = 31;
-               int result = 1;
-               result = prime * result + ((uri == null) ? 0 : uri.hashCode());
-               return result;
-       }
-
-       @Override
-       public boolean equals(Object obj) {
-               if (this == obj)
-                       return true;
-               if (obj == null)
-                       return false;
-               if (getClass() != obj.getClass())
-                       return false;
-               PolicyUri other = (PolicyUri) obj;
-               if (uri == null) {
-                       if (other.uri != null)
-                               return false;
-               } else if (!uri.equals(other.uri))
-                       return false;
-               return true;
-       }
+        return this.toString();
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((uri == null) ? 0 : uri.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        PolicyUri other = (PolicyUri) obj;
+        if (uri == null) {
+            if (other.uri != null)
+                return false;
+        } else if (!uri.equals(other.uri))
+            return false;
+        return true;
+    }
 
     @Override
-       public String toString() {
-               if (uri.size() == 0) return "";
-               StringBuffer sb = new StringBuffer();
-
-               for (String s: uri) {
-                       sb.append(s);
-               }
-               return sb.toString();
-       }
+    public String toString() {
+        if (uri.size() == 0)
+            return "";
+        StringBuffer sb = new StringBuffer();
+
+        for (String s : uri) {
+            sb.append(s);
+        }
+        return sb.toString();
+    }
 }