Update ONOS src to commit id 69b36d5d11e81e28e56b46ba44e4b8cd701c5867 53/2753/1
authorAshlee Young <ashlee@onosfw.com>
Fri, 23 Oct 2015 15:31:31 +0000 (08:31 -0700)
committerAshlee Young <ashlee@onosfw.com>
Fri, 23 Oct 2015 15:31:31 +0000 (08:31 -0700)
commite52e67767076b29cb01939aa7bdd8fee9d205cc1
treeb8c2d28231bccc2a280fea429a9af7297c62f58f
parenta912c5ce9968da5936a695064f22083898e7b93d
Update ONOS src to commit id 69b36d5d11e81e28e56b46ba44e4b8cd701c5867

Change-Id: I9c13045711dbf9c0181106b66a6bf22c72bcf330
Signed-off-by: Ashlee Young <ashlee@onosfw.com>
106 files changed:
framework/src/onos/apps/aaa/src/main/java/org/onosproject/aaa/AAA.java
framework/src/onos/apps/aaa/src/main/java/org/onosproject/aaa/AAAConfig.java
framework/src/onos/apps/aaa/src/test/java/org/onosproject/aaa/AAAIntegrationTest.java [new file with mode: 0644]
framework/src/onos/apps/aaa/src/test/java/org/onosproject/aaa/AAATest.java
framework/src/onos/apps/aaa/src/test/java/org/onosproject/aaa/AAATestBase.java [new file with mode: 0644]
framework/src/onos/apps/aaa/src/test/java/org/onosproject/aaa/StateMachineTest.java
framework/src/onos/apps/cordvtn/pom.xml
framework/src/onos/apps/cordvtn/src/main/java/org/onosproject/cordvtn/CordVtn.java
framework/src/onos/apps/cordvtn/src/main/java/org/onosproject/cordvtn/CordVtnConfigManager.java
framework/src/onos/apps/cordvtn/src/main/java/org/onosproject/cordvtn/OvsdbNode.java
framework/src/onos/apps/cordvtn/src/main/java/org/onosproject/cordvtn/cli/OvsdbNodeAddCommand.java [new file with mode: 0644]
framework/src/onos/apps/cordvtn/src/main/java/org/onosproject/cordvtn/cli/OvsdbNodeConnectCommand.java [new file with mode: 0644]
framework/src/onos/apps/cordvtn/src/main/java/org/onosproject/cordvtn/cli/OvsdbNodeDeleteCommand.java [new file with mode: 0644]
framework/src/onos/apps/cordvtn/src/main/java/org/onosproject/cordvtn/cli/OvsdbNodeDisconnectCommand.java [new file with mode: 0644]
framework/src/onos/apps/cordvtn/src/main/java/org/onosproject/cordvtn/cli/OvsdbNodeListCommand.java [new file with mode: 0644]
framework/src/onos/apps/cordvtn/src/main/java/org/onosproject/cordvtn/cli/package-info.java [new file with mode: 0644]
framework/src/onos/apps/cordvtn/src/main/java/org/onosproject/cordvtn/package-info.java [new file with mode: 0644]
framework/src/onos/apps/cordvtn/src/main/resources/OSGI-INF/blueprint/shell-config.xml [new file with mode: 0644]
framework/src/onos/apps/olt/pom.xml
framework/src/onos/apps/olt/src/main/java/org/onosproject/olt/AccessDeviceConfig.java [new file with mode: 0644]
framework/src/onos/apps/olt/src/main/java/org/onosproject/olt/AccessDeviceData.java [new file with mode: 0644]
framework/src/onos/apps/olt/src/main/java/org/onosproject/olt/AccessDeviceService.java [new file with mode: 0644]
framework/src/onos/apps/olt/src/main/java/org/onosproject/olt/OLT.java
framework/src/onos/apps/olt/src/main/java/org/onosproject/olt/SubscriberAddCommand.java [new file with mode: 0644]
framework/src/onos/apps/olt/src/main/resources/OSGI-INF/blueprint/shell-config.xml [new file with mode: 0644]
framework/src/onos/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java
framework/src/onos/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DeviceConfiguration.java
framework/src/onos/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/ECMPShortestPathGraph.java
framework/src/onos/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/IpHandler.java
framework/src/onos/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
framework/src/onos/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
framework/src/onos/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultEdgeGroupHandler.java
framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/VirtualPortService.java
framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/impl/VirtualPortManager.java
framework/src/onos/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
framework/src/onos/cli/src/main/java/org/onosproject/cli/net/InterfaceAddCommand.java
framework/src/onos/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/TrafficTreatment.java
framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/criteria/ArpPaCriterion.java [new file with mode: 0644]
framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java
framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/instructions/Instruction.java
framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java
framework/src/onos/core/api/src/main/java/org/onosproject/ui/topo/DeviceHighlight.java
framework/src/onos/core/api/src/main/java/org/onosproject/ui/topo/NodeBadge.java [new file with mode: 0644]
framework/src/onos/core/api/src/main/java/org/onosproject/ui/topo/NodeHighlight.java
framework/src/onos/core/api/src/main/java/org/onosproject/ui/topo/TopoConstants.java
framework/src/onos/core/api/src/main/java/org/onosproject/ui/topo/TopoJson.java
framework/src/onos/core/api/src/test/java/org/onosproject/ui/topo/NodeBadgeTest.java [new file with mode: 0644]
framework/src/onos/core/api/src/test/java/org/onosproject/ui/topo/TopoJsonTest.java
framework/src/onos/docs/internal-apps
framework/src/onos/docs/internal-netconf
framework/src/onos/drivers/src/main/java/org/onosproject/driver/pipeline/CpqdOFDPA1Pipeline.java
framework/src/onos/drivers/src/main/java/org/onosproject/driver/pipeline/OLTPipeline.java
framework/src/onos/drivers/src/main/java/org/onosproject/driver/pipeline/OpenVSwitchPipeline.java
framework/src/onos/etc/init/onos.conf [deleted file]
framework/src/onos/etc/org.ops4j.pax.url.mvn.cfg [deleted file]
framework/src/onos/etc/org.ops4j.pax.web.cfg [deleted file]
framework/src/onos/etc/samples/linkGraph.cfg [deleted file]
framework/src/onos/etc/samples/org.onosproject.fwd.ReactiveForwarding.cfg [deleted file]
framework/src/onos/etc/samples/org.onosproject.provider.host.impl.HostLocationProvider.cfg [deleted file]
framework/src/onos/etc/samples/org.onosproject.provider.lldp.impl.LLDPLinkProvider.cfg [deleted file]
framework/src/onos/etc/samples/org.onosproject.provider.netconf.device.impl.NetconfDeviceProvider.cfg [deleted file]
framework/src/onos/etc/samples/org.onosproject.provider.nil.device.impl.NullDeviceProvider.cfg [deleted file]
framework/src/onos/etc/samples/org.onosproject.provider.nil.link.impl.NullLinkProvider.cfg [deleted file]
framework/src/onos/etc/samples/org.onosproject.provider.nil.packet.impl.NullPacketProvider.cfg [deleted file]
framework/src/onos/etc/samples/org.onosproject.proxyarp.ProxyArp.cfg [deleted file]
framework/src/onos/etc/samples/org.onosproject.routing.bgp.BgpSessionManager.cfg [deleted file]
framework/src/onos/etc/samples/org.onosproject.xos.XOS.cfg [deleted file]
framework/src/onos/etc/users.properties [deleted file]
framework/src/onos/incubator/api/src/main/java/org/onosproject/incubator/net/config/basics/InterfaceConfig.java
framework/src/onos/incubator/api/src/main/java/org/onosproject/incubator/net/intf/Interface.java
framework/src/onos/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitch.java
framework/src/onos/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
framework/src/onos/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageEncoder.java
framework/src/onos/opt/onos/.empty [deleted file]
framework/src/onos/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/driver/DefaultOvsdbClient.java
framework/src/onos/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
framework/src/onos/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java
framework/src/onos/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
framework/src/onos/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/OpenFlowGroupProvider.java
framework/src/onos/tools/package/config/samples/network-cfg.json
framework/src/onos/tools/package/config/samples/segmentrouting_dell.conf [deleted file]
framework/src/onos/tools/test/scenarios/sequential-example.xml [new file with mode: 0644]
framework/src/onos/utils/misc/src/main/java/org/onlab/packet/EthType.java
framework/src/onos/utils/misc/src/main/java/org/onlab/packet/MacAddress.java
framework/src/onos/utils/misc/src/main/java/org/onlab/packet/PIM.java
framework/src/onos/utils/misc/src/main/java/org/onlab/packet/pim/PIMAddrGroup.java
framework/src/onos/utils/misc/src/main/java/org/onlab/packet/pim/PIMAddrSource.java
framework/src/onos/utils/misc/src/main/java/org/onlab/packet/pim/PIMAddrUnicast.java
framework/src/onos/utils/stc/src/main/java/org/onlab/stc/Compiler.java
framework/src/onos/utils/stc/src/test/java/org/onlab/stc/CompilerTest.java
framework/src/onos/utils/stc/src/test/resources/org/onlab/stc/scenario.xml
framework/src/onos/web/gui/src/main/webapp/app/fw/svg/glyph.js
framework/src/onos/web/gui/src/main/webapp/app/view/topo/topoD3.js
framework/src/onos/web/gui/src/main/webapp/app/view/topo/topoForce.js
framework/src/onos/web/gui/src/main/webapp/app/view/topo/topoOverlay.js
framework/src/onos/web/gui/src/test/_karma/ev/badges/ev_1_addInstance.json [new file with mode: 0644]
framework/src/onos/web/gui/src/test/_karma/ev/badges/ev_2_addDevice_s1.json [new file with mode: 0644]
framework/src/onos/web/gui/src/test/_karma/ev/badges/ev_3_addDevice_s2.json [new file with mode: 0644]
framework/src/onos/web/gui/src/test/_karma/ev/badges/ev_4_addLink_1_2.json [new file with mode: 0644]
framework/src/onos/web/gui/src/test/_karma/ev/badges/ev_5_showHighlights_clear.json [new file with mode: 0644]
framework/src/onos/web/gui/src/test/_karma/ev/badges/ev_6_showHighlights_stuff.json [new file with mode: 0644]
framework/src/onos/web/gui/src/test/_karma/ev/badges/ev_7_showHighlights_clear.json [new file with mode: 0644]
framework/src/onos/web/gui/src/test/_karma/ev/badges/scenario.json [new file with mode: 0644]
framework/src/onos/web/gui/src/test/_karma/ev/traffic/scenario.json