463 Commits

Author SHA1 Message Date
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
sangyun-han
07a572fc94 [ONOS-4668] Refactoring port statistic collector using SharedExecutor
- Add OpenFlowSwitchAdapter

Change-Id: I7bd9c61d8961bee18eca2c1ac0e5fca610e166e5
2016-08-03 04:02:12 +00:00
Jonathan Hart
bdfb5cb428 Fix cpman Buck build
Change-Id: I08d6db71a4e78a5528377cc4489decaa5b763248
2016-08-01 13:59:49 -07:00
Thiago Santos
877914d664 [ONOS-4931] fix doc of FlowEntry.life(), add life(TimeUnit)
Fix the doc: life() returns the time in seconds, not milliseconds.

Add new method life(TimeUnit) that allows specifying the timeunit to
receive the life value as as seconds might not be enough for
all applications and OpenFlow can provide this value to nanoseconds resolution
(in its spec).

Change-Id: Ia6a7573797249e0edc04e03c7204a550a2823742
2016-07-26 21:32:46 +00:00
sangyun-han
147e6f431d Add switch null exception and log
Change-Id: Ibf8d7d05c2e86cd7d7f73c6bcd1eb3575ca5ed4b
2016-07-26 17:31:55 +00:00
Thomas Vachuska
2dec354e02 Extending the versioning to cover BUCK artifacts.
Adding ability to version extraneous stuff.

Change-Id: I2e18dafd6d8705504ab01000d6707037415dfd0c
(cherry picked from commit 251016df5db8f11a14c4856f9b381e85ae1e2631)
2016-07-14 18:20:10 +00:00
Phaneendra Manda
8db7d092ba [ONOS-4612]Update SFC flows inline with the Official OVS NSH patch
Change-Id: If58517841096a939860d88aa78eca7cae46b9935
2016-07-07 17:19:48 +00:00
yjimmyy
646aa02614 Implement PowerConfig for Oplink Devices
Change-Id: I939126580f8d3cdcdbcd9a46f6ee5cacbd25051d
2016-07-07 03:30:46 +00:00
Yuta HIGUCHI
07752ecffa Attempt to reduce harmless warnings during shutdown
Change-Id: I431c9d5944c1655c45c4ece8b39da4fdb108c6f4
2016-06-29 22:49:20 -07:00
Jimmy Yan
4deb03b729 Use LambdaQuery in OpenFlowDeviceProvider to get details for optical ports and fix OmsPort totalChannels()
Change-Id: I09bee1ad1cbf4b8d7185c2b022ffed4d8b2ef2e7
2016-06-28 20:44:47 +00:00
Madan Jampani
6b26610e79 Fixes concurrency bug by using a ConcurrentMap
Change-Id: Ib87efe01cb926a3b4c789c9875458ad2ba1b7c8c
(cherry picked from commit 25ba56836827f4c17ced3d9f4148a284c16b9fe4)
2016-06-23 08:49:12 +00:00
Madan Jampani
84382b9426 Misc fixes in openflow provider subsystem
Change-Id: I5e6ab619f66ca71badc25efc7be7560070639051
(cherry picked from commit 91e1d737f6c60b48d7b2eb03a524138db1d68e8c)
2016-06-23 08:48:38 +00:00
Simon Hunt
7a30765c6b Fixed capitalization of "portStatsPollFrequency" property.
- all other properties defined in core ONOS start with lowercase letter.

Change-Id: Ia2750bef205196a621e9a37dedf2379a9de17342
2016-06-23 08:45:13 +00:00
Brian O'Connor
1b2aea88c0 Removing gratuitous relativePath from pom.xmls
The default value for relativePath is: ../pom.xml

Change-Id: I1f5e5e6bfa1e91fcddae4f8cb8ab0c00c276e6b0
2016-06-16 07:05:31 +00:00
Thomas Vachuska
a394b95a6d Fixed issue with leaking various switch-related collectors, e.g. port stats, meters, table stats, flow stats.
Change-Id: If46102708fa88cf5f251a18cb9ce09393fb95752
2016-06-14 23:23:57 +00:00
Jian Li
11260a0192 Try to use ModMplsHeaderInstruction and ModVlanHeaderInstruction
Change-Id: I0b486907ef718a6dfa3e92696397fe5a7e851aed
2016-06-13 15:46:14 +00:00
Brian O'Connor
e642f7cf7b Bumping version to 1.7.0-SNAPSHOT
Change-Id: Id105bf08ecbdac6d4e214ae035b4220aea90f29f
2016-05-23 18:35:29 -07:00
lishuai
67574ce79d [ONOS-4523] Add SetField of ARP_OP, ARP_SHA, ARP_SPA.
Change-Id: I48dfcebaddc9149e830a0ad7cc7223fd604c9e8f
2016-05-17 17:48:07 +00:00
HIGUCHI Yuta
5be3e820cf ONOS-4417 Remove OtuPort out of core.
Change-Id: Ibc72ee617b238005585f0bcd873b9123e48ee7fc
2016-05-09 23:39:00 +00:00
HIGUCHI Yuta
4c0ef6b54a ONOS-4416 Remove OduCltPort out of core.
Change-Id: I04324a72e48af84afdbfa32b84c8e57f39411000
2016-05-09 23:38:47 +00:00
HIGUCHI Yuta
95d83e8067 ONOS-4415 Remove OmsPort out of core.
Change-Id: Ic796c4e715789ba18f350f28e29db04dd537822f
2016-05-09 23:38:16 +00:00
HIGUCHI Yuta
34a3f69be1 ONOS-3503 Remove OchPort out of core.
- Implementation of a Behavior OpticalDevice has the knowledge of
  translating annotations into optical specific port.
- OpticalDeviceServiceView checks if the Device is a OpticalDevice
  and translate all the Ports to optical specific port before returning.

- This commit contains feedbacks, issues, and fixes by Michele Santuari.

- Note: 3 more Port types to go (OduClt, Oms, Otu)

Change-Id: I4cbda8bc1922fbdd4dac8de8d02294bad74b8058
2016-05-09 22:24:41 +00:00
Charles Chan
c314294263 Override app_name to make it consistent with maven build
Change-Id: Ief3540c3fd90a553d8d2ec31cb65e657022d4bb3
2016-05-06 09:16:53 +00:00
HIGUCHI Yuta
862dcd2cf5 Fix source file permission
Change-Id: I72361f30863c49167d4a65660373e86e9283980f
2016-05-04 20:43:28 +00:00
Thomas Vachuska
777dbd7fdc Adding buck build of the meta openflow app.
Change-Id: I56f0ed3776c958680fd046295d0fbd6f18a32c56
2016-05-04 17:31:29 +00:00
heisenberg
d35113e06d [ONOS-4476]As with Group type is FAILOVER,watchPort&watchGroup does not set correctly When builds the Group Modification Openflow message
Change-Id: I344e3b03cd18e16f4e30ceb5b67ce9e55e871876
2016-05-04 17:11:28 +00:00
Jian Li
a78cdb217a Refactor the logic on collecting OpenFlow message statistics
Change-Id: I34c209c0ca90cb094ed5f82c96a8a43d3519b807
2016-05-03 19:03:28 +00:00
Charles Chan
b3ef0db920 ONOS-4395 Fix NPE in OpenFlowDeviceProvider
Following gerrit #8858

Change-Id: I55cc4d9ee028e11e099657752a12d2c026893a59
2016-05-03 11:20:33 -07:00
sangyun-han
c180686042 Add configurable method to SimpleFlowRuleStore
- Add @Modified annotation
- Delete TODO annotation

Change-Id: Ida2855c23105f68cfa2f2b7bb4ec3f384a2de838
2016-05-02 22:12:03 +00:00