491 Commits

Author SHA1 Message Date
Ray Milkey
57b510152e Starting snapshot 1.10-SNAPSHOT
Change-Id: I800d5d9e7f23793f5288457bca449ca382896723
2017-02-13 11:06:55 -08:00
Ray Milkey
de84cdde9a Starting snapshot 1.9.0-SNAPSHOT 2017-02-13 10:54:12 -08:00
Ray Milkey
8588c48114 Tagging 1.9.0-b3 2017-02-13 10:52:31 -08:00
Jordi Ortiz
aa8de49765 [ONOS-5599] Store meter features into MeterStore
Change-Id: I22f7366b87cad6fc706b6ff7b0ccff1a0e85ad6a
2017-01-24 12:08:25 -08:00
Yuta HIGUCHI
67f2cca463 ONOS-5856 do not poll meter against optical device
Change-Id: Id00e29eedc1e89af8998c8b0fd7c31caa98d99da
2017-01-24 01:47:49 +00:00
Thiago Santos
15c70a1b3e [ONOS-5852] GroupBucket: Dont ignore weight from OF message
Use it, instead of defaulting to 1

Change-Id: I163d179840d2db744d4179dc89bf1b17f4b77a3f
2017-01-20 16:20:33 +00:00
Andrea Campanella
c8b871ab86 ONOS-5850 Fix annotations null values
Change-Id: I324186858cde2ebc16a3a488378ce731cbb82aac
2017-01-20 01:36:51 +00:00
Ray Milkey
287b4ae810 Starting snapshot 1.9.0-SNAPSHOT 2017-01-19 15:21:17 -08:00
Ray Milkey
2557ba3375 Tagging 1.9.0-b1b 2017-01-19 15:20:17 -08:00
Jon Hall
cbd1b39f58 Sonar fixes
Rule: Use isEmpty() to check whether the collection is empty or not.

Change-Id: Ib5ab56b2263623b297db56c5cac2c2ee80e12725
2017-01-19 20:24:18 +00:00
Thomas Vachuska
a79cbf75de Backing out memoizing driver name from the OF device provider because it breaks number of STC scenarios.
Change-Id: Ie07ebe4428ffc70273b494a6a6bd303c05b70a8c
2017-01-13 15:07:04 -08:00
Victor Silva
ac8dab0e59 [ONOS-5795] OFDeviceProvider: save driver info in Device object
The Device object has an annotation field that can store driver
information. Doing so prevents us from extremely frequent calls
to find out which driver to use for a Device.

Calls to "getDrivers" can be responsible for a relevant part of
CPU usage in larger topologies.

Change-Id: Ie9d54f86efed75206639d270373361b4ea060a8a
2017-01-12 19:50:29 +00:00
Victor Silva
03265dd2da [ONOS-5794] OFDeviceProvider: always stop collectors
In larger topologies, switchRemoved occasionally triggered
exceptions before it reached the code to stop the collectors,
leaving these collectors trying to talk to devices even if
they were no longer there.

Change so that stopCollectorIfNeeded is always called, as it is
in other OpenFlow provider classes.

Change-Id: I3556a19b5fd15fe73816a785d886a27344df89e4
2017-01-11 18:10:29 +00:00
Sangsik Yoon
b1b823fd3f [newOpenTAM] new Upgraded AFM and FlowStatisticService
New Upgraded AFM(Adaptive Flow Monitoring) and FlowStatisticService.
  .Reabsed from master 2016.12.06, and assumed avgPollInterval in FlowStatisticService with flowPollFrequency in case adativeFlowSampling is true or false
  .Fixed Yuta HIGUCHI comments, 2016.12.03
  .Fixed checkstyle warning
  .Rebased and added interrupted flag for exiting while() loop when IterruptException is caught in NewAdaptiveFlowStatsCollector.java

  .Fixed and added javadocs from Thomas Vachuska's comment
  .Removed synchronized block in OpenFlowRuleProvider.java for avoiding performance degradation
  .Rebased from master 2016.10.13 1.8.0.SNAPSHOT
  .Rebased from master 2016.09.09
  .Fixed Yuta HIGUCHI's comments
   (made default getFlowEntriesByLiveType interface,
    added checkArgument() for StoredFlowEntry,
    added @Deprecated annotation @deprecated javadoc,
    added Thread.currentThread.interrupt()
    and fixed Default Adaptive Flow Sampling value with false.)

  .Rebased from master branch
  .Fix typo in FlowRuleService.java comment line
  .Quick Bug fix in NewAdaptiveFlowStatCollector
  .master rebased for fixing build Failure
  .Removed synchronized block in FlowRuleProvider and NewAdaptiveFlowStatCollector for performance upgrade

  .Removed duplicated flow entries in NewAdaptiveFlowStatsCollector
  .Removed additional operation (add/remove/mod) of flow entry in OpenFlowRuleProvider
  .Set default adaptiveFlowSampling value with true
  .Added liveType (IMMEDIATE, SHORT, MID, LONG) member variable in FlowEntry
  .New added PollInterval static class for pollInterval value adjustment
  .Updated FlowEntryBuilder and FlowEntry constructor
  .Added liveType print in FlowListCommand CLI
  .Removed FlowStatisticStore, used existing StatisticStore
  .New added FlowEntryWithLoad for replacing the old TypedFlowEntryWithLoad
  .Added new interfaces in FlowStatisticService
  .Updated GetFlowStatistics CLI for using new interfaces
  .All Typedxxx classes are deprecated

  .new created review 9292 from review 9232
  .fixed Jian Li's review comment from review 9232
  .fixed Build failure in core/net/BUCK file

Change-Id: I7a0e39c5220a2b279b68a195347c183b5bdf1a49
2016-12-07 20:04:36 +00:00
Ray Milkey
72bcefefce Starting snapshot 1.9.0-SNAPSHOT
Change-Id: Iae30168353c72c4e2d5e395298ceca5dd7554984
2016-12-02 16:22:53 -08:00
Ray Milkey
bc3c6ba539 Starting snapshot 1.8.0-SNAPSHOT 2016-12-02 15:59:38 -08:00
Ray Milkey
a222d05a18 Tagging 1.8.0-rc4 2016-12-02 15:49:32 -08:00
Ray Milkey
b547e06157 Starting snapshot 1.8.0-SNAPSHOT 2016-11-30 15:10:18 -08:00
Ray Milkey
4f6d428dc7 Tagging 1.8.0-rc3 2016-11-30 14:52:32 -08:00
Pier Ventre
db252ccbd4 [CORD-545] Adds QoS Index support in ONOS core
Change-Id: If7649bdf70f5a796466b8efc5798dc3346ea94a0
2016-11-30 18:44:16 +00:00
Pier Ventre
9cf536b4ea [CORD-545] Adds MPLS L2 Port support in ONOS core
Change-Id: I61d9b2c14580b4995fdcc96571745bfd00ee586f
2016-11-30 18:29:37 +00:00
Ray Milkey
58c6af2321 Starting snapshot 1.8.0-SNAPSHOT 2016-11-22 17:26:52 -08:00
Ray Milkey
8b8b30ce29 Tagging 1.8.0-rc1 2016-11-22 17:08:32 -08:00
Pier Ventre
23f786764b Fixes [CORD-626]
Changes:
- Fixes bos decoding

Change-Id: I18b152c3c787c59885e669e1c89d10622c7bd847
2016-11-17 19:45:55 +00:00
Kavitha Alagesan
47b80faa32 FIX_FOR_ONOS-5610
Change-Id: Ibb277628ad60c90fe2ebaf4a2d6ef123fbb8a764
(cherry picked from commit 00ded542dbf467097f38dd5006c8904a18e06434)
2016-11-14 09:16:40 +00:00
Pier Ventre
6f63005f9f [CORD-545] Adds OVID support in ONOS core
Change-Id: Ib0c195825e86c245e626a11b0eac5d7003b561b0
2016-11-11 23:26:57 +00:00
Konstantinos Kanonakis
9215ff2260 Adding support for VLAN_PUSH with EtherType (incl. Q-in-Q)
- Allowing VLAN_PUSH Instruction to use ethernetType (incl. using REST API)
 - Adding QINQ (0x88a8) Ethernet type
 - Updating InstructionCodec decoders/encoders
 - Updating TrafficTreatment/FlowEntryBuilder

Change-Id: I723cc936a8a49c39da9abe65ba9e5b1bdc1392bf
2016-11-07 16:49:14 +00:00
Pier Ventre
cd64e899e9 Bumping openflowj version to 0.9.7.onos
Change-Id: I1288d90a22df038ba4ae6d228fa496451ba95c52
2016-10-29 01:36:09 +00:00
Charles Chan
cad338a4cb CORD-413 Implement MPLS Termination in OFDPA3 pipeliner
Additionally, this patch includes
- Minor refactoring
- Skip method length checkstyle for FlowEntryBuilder::hasSetField

Change-Id: I7887f454f552a9e346c323524f359929deadf427
2016-10-19 16:55:56 +00:00
Victor Silva
ff5871b061 OpenFlow: use same timer throughout all component lifetime
Calls to the modified methods (all configuration changes through the
CLI, for example) of OpenFlowDeviceProvider and OpenFlowRuleProvider
cause a switch from executor to another one on PortStatsCollector and
FlowStats collector respectively.

Since these Collectors are constructed with a Timer argument, we might
as well use those timers properly right away.

Change-Id: I32aa8c89d9615ea065e5fd9fd7dfc70da96b9739
2016-10-17 13:03:54 +00:00
Prince Pereira
141ed81ba3 Fix for ONOS-4803. Issue with of error msg parsing by flood light.
Change-Id: I43b8ce5ab21000670359c76cc24d9a457ff6e125
(cherry picked from commit d258135aa601c66d8395dfc8cd740e4297127741)
2016-09-28 04:31:34 +00:00
Charles Chan
5bf536108b Bumping OpenFlowJ version to 0.9.6.onos
OFDPA_MPLS_TYPE experimenter OXM is introduced in 0.9.6.onos

Change-Id: I4acbc98d80cc418b12006059618dcad9311cd277
2016-09-22 20:30:47 +00:00
Victor Silva
7944d14530 OpenFlowDeviceProvider: call modified to properly grab configuration
Call modified() to grab configuration, if it exists. Current
behavior is to ignore previous cfg files and only really change
the property after configuration events.

Co-Authored-By: Thiago Sousa Santos <thiago@waltznetworks.com>

Change-Id: I48408cc77a296f4ed47a026856ca41458c9c62b7
2016-09-20 19:17:57 +00:00
Brian O'Connor
bfc02ecd22 Bumping snapshot version to 1.8.0-SNAPSHOT
Change-Id: I4ca57b277d8ac814b8a10b107d995cb1cc4d499d
2016-09-16 17:41:55 +00:00
Brian O'Connor
b19fc86f82 Bumping version back to 1.7.0-SNAPSHOT
Change-Id: I1df9d0f12cd7ec7597499d41cacebdbe75899556
2016-09-16 00:12:21 -07:00
Brian O'Connor
338bc0cf19 Bumping pom versions to 1.7.0-rc2 and fixing some maven issues
Change-Id: I6169420328333d0916452aa92efbfa961d72e9c4
2016-09-16 00:11:45 -07:00
Brian O'Connor
0a4e6742b8 Copyright update
Change-Id: I534d938da3820f6fb814aed3bb4a0855fa41ddd5
2016-09-16 06:48:34 +00:00
Jonathan Hart
66da814510 Change order of openflow app dependencies.
Fixes ONOS-5196 where flows for packet requests weren't removed on deactivate
because the device provider deactivated before the others and the flows
could no longer be removed from the flow store.

Change-Id: I79445f5048b21c10e49d4f30d33a5b5a267a9afc
2016-09-02 22:10:50 +00:00
Ray Milkey
3c4124a97e Fix ConcorrentModifcationException in statistics map
Change-Id: I46746afccb0d49277d365589fa7ae550b7c2acb1
2016-08-31 20:41:21 +00:00
Murat Parlakisik
c6759e80bd ONOS-4374 Enable installing flows with hard_timeout
Change-Id: I4e60e93aad44c7e8f8913fa4dd3ed5a2565d7034
2016-08-30 17:46:55 +00:00
Victor Silva
94fa13ed46 [ONOS-5166] GroupModBuilder: no longer ignore weights
We provide an interface for assigning weights to buckets
in a group and thus we should not silently ignore it.
Properly set bucket weight to bucket.weight().

Change-Id: I7dce89e793140ee365a016f4bf26f0ccf206b8dd
2016-08-24 15:15:16 -03:00
Kavitha Alagesan
6704df3767 Fix for ONOS-4877
Change-Id: Ibdb6dfea672c0900fd3d8dea0441c55c23940f81
(cherry picked from commit 6683c2fcdc6659f2bd481a4536cb6f36fbe3a152)
2016-08-23 05:07:50 +00:00
Sho SHIMIZU
1375cfe976 Simplify boolean expression
Change-Id: If0f8d497ac927bdd007292e45f0e394c207163d2
2016-08-19 20:03:35 +00:00
helenyrwu
89470f1d99 Group event indicating failover of previously used live port
Change-Id: I32749b38d5e4fab93fa97bbf6587bd0dc91db88c
2016-08-18 16:56:47 +00:00
Yuta HIGUCHI
0de4ba9401 Remove duplicate version specifications
Change-Id: I0fe6027e66815ab2e7db5e090dd5aea39b3c36e1
2016-08-18 15:59:50 +00:00
Prince Pereira
788797ef87 Fix for BAD-ACTION ONOS-4688 , BAD-MATCH ONOS-4755 and other flow-mod errors.
Change-Id: Icf1a4883da50354bcebdad4c1a9693285d4cf8b4
(cherry picked from commit aaff2927f0c4d67406d4694ca9ddc26c10df71d8)
2016-08-11 16:21:43 +00:00
Jimmy Yan
a010ebc099 Bump up openflowj version to 0.9.5 in features.xml files
Change-Id: Iefeee8771fcbc0a35c6cdc2e128802f324f572d6
2016-08-10 19:46:46 +00:00
Yuta HIGUCHI
c7f35cfe24 Move optical-model dependency to openflow-base
- move optical dependency from openflow meta app to openflow-base

Change-Id: Ibbfdb88b252dd77e103eec7d776f4fde9b33bcab
2016-08-04 00:41:19 +00:00
Yuta HIGUCHI
1d547bf406 [ONOS-4513] decouple optical-model from CLI
- core/cli is now optical-model clean
- Add command for pretty printing optical-ports

Change-Id: I2926ef6d52971d1a7f6642dfe4098d7ed2422363
2016-08-03 18:54:55 +00:00
HIGUCHI Yuta
f3ead25267 [ONOS-4513] Slice optical-model into separate bundle (1/3)
- net and cli bundle has dependency to optical-model bundle,
  which should be removed in the longer run. (ONOS-4626)

Change-Id: Ieff43ef2002ee21f4578a6e2a729cd35ce3eae3d
2016-08-03 18:54:13 +00:00