Merging the mainline. Modified routemgr to support mdsal.
authorMohnish Anumala <Mohnish_Anumala@Dell.com>
Sat, 26 Sep 2015 00:08:47 +0000 (17:08 -0700)
committerMohnish Anumala <Mohnish_Anumala@Dell.com>
Sat, 26 Sep 2015 00:08:47 +0000 (17:08 -0700)
commit2630762825bd0073c044bd6cc8a4b2771fa152bd
tree1b8c35ae68c67d0ad361a4158c9d101ac247a06f
parentbfb8ca880e5a7c6c8700d738cc28c9b74af817d9
Merging the mainline. Modified routemgr to support mdsal.

Conflicts:
.gitreview
README
features/ovsdb/pom.xml
features/ovsdb/src/main/features/features.xml
integrationtest/pom.xml
integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/OvsdbIntegrationTestBase.java
integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/plugin/OvsdbPluginIT.java
integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/plugin/OvsdbPluginV3IT.java
library/impl/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcDecoder.java
library/impl/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnType.java
library/it/src/test/java/org/opendaylight/ovsdb/lib/it/LibraryIT.java
library/pom.xml
library/src/main/java/org/opendaylight/ovsdb/lib/EchoServiceCallbackFilters.java
library/src/main/java/org/opendaylight/ovsdb/lib/LockAquisitionCallback.java
library/src/main/java/org/opendaylight/ovsdb/lib/MonitorCallBack.java
library/src/main/java/org/opendaylight/ovsdb/lib/MonitorHandle.java
library/src/main/java/org/opendaylight/ovsdb/lib/message/OvsdbRPC.java
library/src/main/java/org/opendaylight/ovsdb/lib/osgi/Activator.java
openstack/net-virt-it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/it/AbstractConfigTestBase.java
openstack/net-virt-providers/pom.xml
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13Provider.java
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/PipelineOrchestratorImpl.java
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/EgressAclService.java
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/IngressAclService.java
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/RoutingService.java
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/arp/ArpSender.java
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/arp/GatewayMacResolverService.java
openstack/net-virt/pom.xml
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/EgressAclProvider.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/IngressAclProvider.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/SecurityServicesManager.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImpl.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityServicesImpl.java
ovsdb-plugin-compatibility-layer/pom.xml
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/api/NodeUtils.java
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/api/OvsdbConfigurationService.java
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/api/OvsdbConnectionService.java
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/api/OvsdbInventoryListener.java
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/api/OvsdbInventoryService.java
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/api/StatusWithUuid.java
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/error/OvsdbPluginException.java
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/impl/ConfigurationServiceImpl.java
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/impl/ConnectionServiceImpl.java
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/impl/InventoryServiceImpl.java
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/internal/Activator.java
plugin-mdsal-adapter/src/main/java/org/opendaylight/ovsdb/plugin/md/Activator.java
plugin-mdsal-adapter/src/main/java/org/opendaylight/ovsdb/plugin/md/OvsdbBindingAwareProvider.java
plugin-mdsal-adapter/src/main/java/org/opendaylight/ovsdb/plugin/md/OvsdbBindingAwareProviderImpl.java
plugin-mdsal-adapter/src/main/java/org/opendaylight/ovsdb/plugin/md/OvsdbInventoryManager.java
plugin-mdsal-adapter/src/main/java/org/opendaylight/ovsdb/plugin/md/Utils.java
plugin-shell/pom.xml
plugin-shell/src/main/java/org/opendaylight/ovsdb/plugin/shell/PrintCache.java
plugin/pom.xml
plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/Connection.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/ConnectionConstants.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/OvsVswitchdSchemaConstants.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/OvsdbConfigurationService.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/OvsdbConnectionService.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/OvsdbInventoryListener.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/OvsdbInventoryService.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/Status.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/StatusCode.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/StatusWithUuid.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/error/OvsdbPluginException.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/impl/ConfigurationServiceImpl.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/impl/ConnectionServiceImpl.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/impl/InventoryServiceImpl.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/internal/Activator.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/internal/Encapsulation.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/internal/NodeDatabase.java
pom.xml
schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Manager.java
southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java
utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/MatchUtils.java

Signed-off-by: Mohnish Anumala <Mohnish_Anumala@Dell.com>
135 files changed:
README
commons/integrationtest/pom.xml
commons/parent/pom.xml
commons/pom.xml
features/ovsdb/pom.xml
features/ovsdb/src/main/features/features.xml
features/pom.xml
integrationtest/pom.xml
integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java [deleted file]
integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/OvsdbIntegrationTestBase.java [deleted file]
integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/library/OvsdbLibraryIT.java [deleted file]
integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/plugin/OvsdbPluginIT.java [deleted file]
integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/plugin/OvsdbPluginV3IT.java [deleted file]
integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/hardwarevtep/HardwareVTEPIT.java [deleted file]
integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/openvswitch/OpenVSwitchIT.java [deleted file]
karaf/pom.xml
northbound/pom.xml
northbound/src/main/java/org/opendaylight/ovsdb/northbound/OvsdbRow.java
openstack/net-virt-it/pom.xml
openstack/net-virt-it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/it/AbstractConfigTestBase.java [deleted file]
openstack/net-virt-it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/it/AbstractMdsalTestBase.java [deleted file]
openstack/net-virt-it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/it/NetvirtIT.java
openstack/net-virt-it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/it/SouthboundMapper.java
openstack/net-virt-providers/pom.xml
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13Provider.java
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/PipelineOrchestratorImpl.java
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/ArpResponderService.java
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/EgressAclService.java
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/IngressAclService.java
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/L3ForwardingService.java
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/RoutingService.java
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/arp/ArpSender.java
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/arp/GatewayMacResolverService.java
openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/EgressAclServiceTest.java
openstack/net-virt-providers/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/IngressAclServiceTest.java
openstack/net-virt-sfc/api/pom.xml [new file with mode: 0644]
openstack/net-virt-sfc/api/src/main/yang/ietf-acl.yang [new file with mode: 0644]
openstack/net-virt-sfc/api/src/main/yang/netvirt-acl.yang [new file with mode: 0644]
openstack/net-virt-sfc/api/src/main/yang/netvirt-classifier.yang [new file with mode: 0644]
openstack/net-virt-sfc/api/src/main/yang/netvirt-sfc.yang [new file with mode: 0644]
openstack/net-virt-sfc/api/src/main/yang/packet-fields.yang [new file with mode: 0644]
openstack/net-virt-sfc/artifacts/pom.xml [new file with mode: 0644]
openstack/net-virt-sfc/features/pom.xml [new file with mode: 0644]
openstack/net-virt-sfc/features/src/main/features/features.xml [new file with mode: 0644]
openstack/net-virt-sfc/impl/pom.xml [new file with mode: 0644]
openstack/net-virt-sfc/impl/src/main/config/default-config.xml [new file with mode: 0644]
openstack/net-virt-sfc/impl/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/NetvirtSfcProvider.java [new file with mode: 0644]
openstack/net-virt-sfc/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/sfc/rev141210/NetvirtSfcModule.java [new file with mode: 0644]
openstack/net-virt-sfc/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/sfc/rev141210/NetvirtSfcModuleFactory.java [new file with mode: 0644]
openstack/net-virt-sfc/impl/src/main/yang/netvirt-sfc.yang [new file with mode: 0644]
openstack/net-virt-sfc/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/sfc/rev141210/NetvirtSfcModuleFactoryTest.java [new file with mode: 0644]
openstack/net-virt-sfc/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/sfc/rev141210/NetvirtSfcModuleTest.java [new file with mode: 0644]
openstack/net-virt-sfc/it/pom.xml [new file with mode: 0644]
openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/NetvirtSfcIT.java [new file with mode: 0644]
openstack/net-virt-sfc/karaf/pom.xml [new file with mode: 0644]
openstack/net-virt-sfc/pom.xml [new file with mode: 0644]
openstack/net-virt/pom.xml
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/MdsalHelper.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/EgressAclProvider.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/IngressAclProvider.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/SecurityServicesManager.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/Southbound.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImpl.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityServicesImpl.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SouthboundImpl.java
openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityServicesImplTest.java
openstack/pom.xml
ovs-sfc/pom.xml
ovsdb-artifacts/pom.xml
ovsdb-plugin-compatibility-layer/pom.xml [deleted file]
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/api/NodeUtils.java [deleted file]
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/api/OvsdbConfigurationService.java [deleted file]
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/api/OvsdbConnectionService.java [deleted file]
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/api/OvsdbInventoryListener.java [deleted file]
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/api/OvsdbInventoryService.java [deleted file]
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/api/StatusWithUuid.java [deleted file]
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/error/OvsdbPluginException.java [deleted file]
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/impl/ConfigurationServiceImpl.java [deleted file]
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/impl/ConnectionServiceImpl.java [deleted file]
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/impl/InventoryServiceImpl.java [deleted file]
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/impl/StatusConvertorUtil.java [deleted file]
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/internal/Activator.java [deleted file]
ovsdb-plugin-compatibility-layer/src/test/java/org/opendaylight/ovsdb/compatibility/plugin/impl/ConnectionServiceImplTest.java [deleted file]
plugin-mdsal-adapter/pom.xml [deleted file]
plugin-mdsal-adapter/src/main/java/org/opendaylight/ovsdb/plugin/md/Activator.java [deleted file]
plugin-mdsal-adapter/src/main/java/org/opendaylight/ovsdb/plugin/md/OvsdbBindingAwareProvider.java [deleted file]
plugin-mdsal-adapter/src/main/java/org/opendaylight/ovsdb/plugin/md/OvsdbBindingAwareProviderImpl.java [deleted file]
plugin-mdsal-adapter/src/main/java/org/opendaylight/ovsdb/plugin/md/OvsdbInventoryManager.java [deleted file]
plugin-mdsal-adapter/src/main/java/org/opendaylight/ovsdb/plugin/md/Utils.java [deleted file]
plugin-mdsal-adapter/src/main/yang/ovsdb-node-inventory.yang [deleted file]
plugin-mdsal-adapter/src/test/java/org/opendaylight/ovsdb/plugin/md/UtilsTest.java [deleted file]
plugin-shell/pom.xml [deleted file]
plugin-shell/src/main/java/org/opendaylight/ovsdb/plugin/shell/PrintCache.java [deleted file]
plugin-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml [deleted file]
plugin-shell/src/test/java/org/opendaylight/ovsdb/plugin/shell/PrintCacheTest.java [deleted file]
plugin-shell/src/test/resources/org/opendaylight/ovsdb/plugin/shell/test_schema.json [deleted file]
plugin/pom.xml [deleted file]
plugin/resources/logback.xml [deleted file]
plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/Connection.java [deleted file]
plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/ConnectionConstants.java [deleted file]
plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/OvsVswitchdSchemaConstants.java [deleted file]
plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/OvsdbConfigurationService.java [deleted file]
plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/OvsdbConnectionService.java [deleted file]
plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/OvsdbInventoryListener.java [deleted file]
plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/OvsdbInventoryService.java [deleted file]
plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/Status.java [deleted file]
plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/StatusCode.java [deleted file]
plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/StatusWithUuid.java [deleted file]
plugin/src/main/java/org/opendaylight/ovsdb/plugin/error/OvsdbPluginException.java [deleted file]
plugin/src/main/java/org/opendaylight/ovsdb/plugin/impl/ConfigurationServiceImpl.java [deleted file]
plugin/src/main/java/org/opendaylight/ovsdb/plugin/impl/ConnectionServiceImpl.java [deleted file]
plugin/src/main/java/org/opendaylight/ovsdb/plugin/impl/InventoryServiceImpl.java [deleted file]
plugin/src/main/java/org/opendaylight/ovsdb/plugin/internal/Activator.java [deleted file]
plugin/src/main/java/org/opendaylight/ovsdb/plugin/internal/Encapsulation.java [deleted file]
plugin/src/main/java/org/opendaylight/ovsdb/plugin/internal/NodeDatabase.java [deleted file]
plugin/src/test/java/org/opendaylight/ovsdb/plugin/impl/ConnectionServiceImplTest.java [deleted file]
pom.xml
routemgr/pom.xml
routemgr/routemgr-api/pom.xml
routemgr/routemgr-artifacts/pom.xml
routemgr/routemgr-config/pom.xml
routemgr/routemgr-features/pom.xml
routemgr/routemgr-features/src/main/features/features.xml
routemgr/routemgr-impl/pom.xml
routemgr/routemgr-karaf/pom.xml
utils/config/pom.xml
utils/mdsal-node/pom.xml
utils/mdsal-openflow/pom.xml
utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/MatchUtils.java
utils/mdsal-utils/pom.xml [new file with mode: 0644]
utils/mdsal-utils/src/main/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtils.java [new file with mode: 0644]
utils/mdsal-utils/src/test/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtilsTest.java [new file with mode: 0644]
utils/pom.xml
utils/servicehelper/pom.xml