Commit graph

128 commits

Author SHA1 Message Date
Mike Duff
08bd755af0 Issue #2636 - Change how retrieval plan is updated over time.
Peer review comments

Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950

Former-commit-id: c125b9d044 [formerly 33f81d8822] [formerly 89bd047283] [formerly c125b9d044 [formerly 33f81d8822] [formerly 89bd047283] [formerly 911789b910 [formerly 89bd047283 [formerly 0144c23a35b6e7134d5c4caecbaa78f6b0c613f5]]]]
Former-commit-id: 911789b910
Former-commit-id: cddd263edc [formerly 42e6591bc8] [formerly 63198d978b2d9ab9f18c26071e586f7a38cac365 [formerly 5f9d913c6d]]
Former-commit-id: f2a50ed00c3b42b132cd818df4e07da12380595e [formerly d277c1caf1]
Former-commit-id: 2467a11a7e
2014-02-18 12:05:26 -06:00
Brad Gonzales
e906d71ac4 Issue #2771 For Data Delivery CAVE now request current id from
the registry EDEX.  Added DATA_DELIVERY_ID to environment that is used instead
of site id for identification when participating in the federation
and subscription identification.

Amend: Created common data delivery package com.raytheon.uf.edex.datadelivery. Moved DataDeliveryIdUtil there.
       Created ClusterIdUtil.  DataDeliveryIdUtil uses that utility.  It also verifies the id against the awips sites.
       Changed centralRegistry.sh to  set CLUSTER_ID to NCF.
       Handle cases where site id is HAK or HUS.
       Check for empty id setting in Cluster ID Util.
       Return full id for Data Delivery ID.
       Simplify Data Delivery ID and return Cluster ID.

Change-Id: Iee140b5626e1962217cca2deb6d1483ebf265911

Former-commit-id: 1d57e9f5f7 [formerly 379c0fb46c] [formerly 19460ed0d7] [formerly 1d57e9f5f7 [formerly 379c0fb46c] [formerly 19460ed0d7] [formerly ba4e308328 [formerly 19460ed0d7 [formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]]]
Former-commit-id: ba4e308328
Former-commit-id: ae35320dd6 [formerly 1b76488111] [formerly eab08c6056f77a408245754e016c16a1db9d08f4 [formerly 3be3380944]]
Former-commit-id: 367c8f66061868a52d255ea46c57bb8c2dc11b5f [formerly 9aa1cb299e]
Former-commit-id: b0421675ff
2014-02-18 11:10:44 -06:00
Brad Gonzales
304704a39d Issue #2636 Changed EdexBandwidthManager startup scheduling to use the
in-memory bandwidth manager to setup initial scheduling because it
is much faster.

Amend: updated log statement.
       fix for rescheduling of already scheduled BandwidthAllocations.

Change-Id: I5c6d6543bce8222cb746fde2951caf6439db5fa3

Former-commit-id: c275da6725 [formerly 9529c1d191] [formerly 0524d3ea53181abcebe32d0fb47e14ba77359c86 [formerly 9c50fb29fd]] [formerly c275da6725 [formerly 9529c1d191] [formerly 0524d3ea53181abcebe32d0fb47e14ba77359c86 [formerly 9c50fb29fd]] [formerly 704e466f28 [formerly 9c50fb29fd [formerly f1a4a7b24290b6e85380668563793ac529fc5b31]]]]
Former-commit-id: 704e466f28
Former-commit-id: e57abad188 [formerly b59278f73f] [formerly fce69a5a63e582579ba583e885690b5aed2ab58f [formerly 0b211e8036]]
Former-commit-id: ce3bd1dae0d4336304304ae2262d659cba06e09c [formerly 104625b66d]
Former-commit-id: a8256a5202
2014-02-07 09:35:36 -06:00
Dave Hladky
36bc408bc2 Issue #2686 Refactor of retrieval
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558

Former-commit-id: 1c8f6fb36d [formerly 7fb7e10cda] [formerly 6172c83afc] [formerly 1c8f6fb36d [formerly 7fb7e10cda] [formerly 6172c83afc] [formerly 39f97723d6 [formerly 6172c83afc [formerly 0b85e00cecdca6c5dcb6deee138f1a002515ac3c]]]]
Former-commit-id: 39f97723d6
Former-commit-id: 14f2c99e46 [formerly 39f5579103] [formerly d5d37d7b55d86fa82a363075d901e0a1583e45de [formerly 2b998409f5]]
Former-commit-id: d275e71a9e574bd23d396da26d9a5eaa6435dea7 [formerly 8e2eb4d255]
Former-commit-id: 59590fdf36
2014-02-05 14:49:26 -06:00
Richard Peter
793aabd17e Merge "Issue #2636 - Scheduling refactor. Single scheduling method now. Review comments" into omaha_14.2.1
Former-commit-id: 176bee122b [formerly 21b0a87d78] [formerly 8f844bc9ce] [formerly 176bee122b [formerly 21b0a87d78] [formerly 8f844bc9ce] [formerly e5af004993 [formerly 8f844bc9ce [formerly a2536c180f68e5ea970e3406e3ef1f899650f3e2]]]]
Former-commit-id: e5af004993
Former-commit-id: 0c66686f19 [formerly d3f13fc4c7] [formerly 221df5c8f19958cdb7f96c8c47eb4903283decbe [formerly 4309c55a5f]]
Former-commit-id: cd20d2699e4537618b026ece7d62e0cb6723221f [formerly 1b8aacc92f]
Former-commit-id: 1aaeaf0037
2014-02-04 18:12:48 -06:00
Mike Duff
451406c3c5 Issue #2636 - Scheduling refactor. Single scheduling method now.
Review comments

Change-Id: I4d1e7c171504a8a6f97d4660bf165857dd6e7e58

Former-commit-id: 75faeae7e4 [formerly 2ca26aaa39] [formerly eee642ac9b] [formerly 75faeae7e4 [formerly 2ca26aaa39] [formerly eee642ac9b] [formerly eb46191ba9 [formerly eee642ac9b [formerly fc9ed661c3fe3ca75d30d8df414b5d1cd5725613]]]]
Former-commit-id: eb46191ba9
Former-commit-id: b7b0bdbfdd [formerly 38aeb23274] [formerly faacb82cc4cbe77a20073a957c9af17454152fba [formerly 684390e599]]
Former-commit-id: 9ebb64c46709c9a6c6431598e44ae990be200fb2 [formerly e8dea0d0dc]
Former-commit-id: bd52f67e0c
2014-02-04 14:01:29 -06:00
Mike Duff
f7f6516da2 Issue #2745 - Don't display fulfilled or cancelled allocations
Former-commit-id: 9c70fb3261 [formerly 4d529f5051] [formerly f81772f4be] [formerly 9c70fb3261 [formerly 4d529f5051] [formerly f81772f4be] [formerly c9b98868d2 [formerly f81772f4be [formerly 7b7f294622e886d7457d7abe0451d3e819568677]]]]
Former-commit-id: c9b98868d2
Former-commit-id: c9aa63c3c8 [formerly 8b3b5a688f] [formerly 444d2596405cc6142a1dc0b4b806d00c570225c6 [formerly 4a07f6fb4c]]
Former-commit-id: f563b418bf49a1b36f27d31b1c9de60b6b56ab31 [formerly 1065c56bde]
Former-commit-id: a33c96d8fc
2014-02-03 16:57:03 -06:00
Brad Gonzales
7e84f1a451 Issue #2709 updated devRegistry.sh and added retrieval monolithic for running shareds in devRegistry.
Amend: update from peer review.

Change-Id: I1986de99319fdecd21a94579c499266b048d382a

Former-commit-id: 208d18e28e [formerly afbaf72617] [formerly e94023097e] [formerly 208d18e28e [formerly afbaf72617] [formerly e94023097e] [formerly 02f9fd20dc [formerly e94023097e [formerly 4057294c4f777ffb4ea3523bbaea7ed1a084cbd6]]]]
Former-commit-id: 02f9fd20dc
Former-commit-id: 07eac8a84d [formerly 71a32928d9] [formerly 44dcb29c662d33832c30a88262faccc81d37a10a [formerly a40afbe8ac]]
Former-commit-id: e98e41995555ae6eff555a6489dfa8be21dda1aa [formerly f7c3c8c83d]
Former-commit-id: 7707be3dcd
2014-01-26 20:31:38 -06:00
Lee Venable
effcad7487 Merge "Issue #2741 Fixed nullpointers in Retrieval and BWM Change-Id: I2530b194fa7f1b4fb2a6af4211e82b29b9b0c576" into omaha_14.2.1
Former-commit-id: a2d5ac6a20 [formerly e3e3c4feef] [formerly a49cfc6a74] [formerly a2d5ac6a20 [formerly e3e3c4feef] [formerly a49cfc6a74] [formerly d9d985eee4 [formerly a49cfc6a74 [formerly 9e39a2d080e9727965a4e840847d9940af2ec3ad]]]]
Former-commit-id: d9d985eee4
Former-commit-id: dd2dfceab2 [formerly f7dff455d2] [formerly 5f366aedf7b2ddda435296df7d5daca4ff12d14c [formerly f387778dce]]
Former-commit-id: b5a2dec0314faf47df86fa1cc2f241044a7433fb [formerly f64efd9712]
Former-commit-id: 4cbf1f4ff4
2014-01-26 19:17:04 -06:00
Mike Duff
3efeba383b Issue #2636 - Fix point scheduling
Former-commit-id: a617ded73f [formerly 2c4f25ae81] [formerly af45ad9ac1] [formerly a617ded73f [formerly 2c4f25ae81] [formerly af45ad9ac1] [formerly c0e7aa2af3 [formerly af45ad9ac1 [formerly 6291c630ca3c1999870eb6045c95131153b1d305]]]]
Former-commit-id: c0e7aa2af3
Former-commit-id: 8efdea8fab [formerly e02576f737] [formerly 8b684dac184430b2c33872505cf6993afc93701c [formerly f04058849f]]
Former-commit-id: bfa0b8dbad5e8a9a988251be2f87878340b199aa [formerly 190964c224]
Former-commit-id: 5fb0034000
2014-01-26 18:59:10 -06:00
Dave Hladky
c6c43b4b4c Issue #2741 Fixed nullpointers in Retrieval and BWM
Change-Id: I2530b194fa7f1b4fb2a6af4211e82b29b9b0c576

Former-commit-id: 6b263aa771 [formerly efbb7faced] [formerly c06fd8317c] [formerly 6b263aa771 [formerly efbb7faced] [formerly c06fd8317c] [formerly 2e1d02fe21 [formerly c06fd8317c [formerly 3c47b3cb0ee18e485082e8a53d43b38722c5dce4]]]]
Former-commit-id: 2e1d02fe21
Former-commit-id: e52c4df6e1 [formerly 3bf1afdf70] [formerly b6e7eea399c4c32389427091c40541f8992bc3c5 [formerly 64991d004c]]
Former-commit-id: 3922798354c33c4c6e6e142d19cfbd6921e865a4 [formerly c735006401]
Former-commit-id: 50cf7cbaeb
2014-01-26 18:15:09 -06:00
Mike Duff
645998a25d Issue #2636 - Fix scheduling gaps at start and end of retrieval plan
Change-Id: I43930a2cb69f44c83eeec605861bcf6a52a0a26b

Former-commit-id: 439f0ab55a [formerly a4a910daf1] [formerly 6f7cadba9f] [formerly 439f0ab55a [formerly a4a910daf1] [formerly 6f7cadba9f] [formerly 4334640c22 [formerly 6f7cadba9f [formerly c0d49492af75d0411d6c0c2541af440302595b6a]]]]
Former-commit-id: 4334640c22
Former-commit-id: 82ea159287 [formerly c8e199569a] [formerly ee5e22e05d90a6bf7102e085b4c3e6311e5a6121 [formerly 3e26dc54df]]
Former-commit-id: bf35956d28e0d66ed96bc4d2006f484c68071f63 [formerly a7eed82b28]
Former-commit-id: 952c843d02
2014-01-25 14:09:02 -06:00
Mike Duff
0672db6081 Issue #2538 - Add AdhocSubscripionHander to SubscriptionHandler. Fix problem querying for adhoc subs.
Former-commit-id: 4038246f93 [formerly 9bd8e84b9f] [formerly bdf6a002f6] [formerly 4038246f93 [formerly 9bd8e84b9f] [formerly bdf6a002f6] [formerly 9a2d2af4a9 [formerly bdf6a002f6 [formerly 5fc6b9fcc55b6e93c9837c7b99347df8f28fc90a]]]]
Former-commit-id: 9a2d2af4a9
Former-commit-id: 7e3e76e9da [formerly e929abf7d7] [formerly d100328be0c1140a5b43dcb2f41ad9e6ab41095e [formerly 9112366cae]]
Former-commit-id: d799b7c4eda4917284ed7af90a20dbf028cb2301 [formerly 8844bbbe2d]
Former-commit-id: e8d473b9c6
2014-01-20 17:44:02 -06:00
Dave Hladky
940945ebcf Issue #2398 Fixed scheduling outside of active period/ expired window
Change-Id: I6a07a597e84351d02cb1a0da29f796d86af28107

Former-commit-id: 8e3f8b878c [formerly 470ce5269e] [formerly ae45dee861] [formerly 8e3f8b878c [formerly 470ce5269e] [formerly ae45dee861] [formerly dfc0d6d9f5 [formerly ae45dee861 [formerly d5e3fdf7bd51177d24312d9daa6af7a2a4920f06]]]]
Former-commit-id: dfc0d6d9f5
Former-commit-id: 37a34e450e [formerly 02d357c803] [formerly 6cd36c883560cd24390647a125e2c8bcf489e09f [formerly 986e0d7dbe]]
Former-commit-id: 9a804df08a40c927c4da2157af403c2110c0d331 [formerly 305697650e]
Former-commit-id: 0c8901b01d
2014-01-20 17:35:44 -06:00
Richard Peter
caf9de2ed6 Merge "Issue #2459 - Remove unscheduled status from UI" into omaha_14.2.1
Former-commit-id: 007de15a53 [formerly e6bc012925] [formerly 6b859c9a42] [formerly 007de15a53 [formerly e6bc012925] [formerly 6b859c9a42] [formerly 29ba337367 [formerly 6b859c9a42 [formerly afdfd6b07687c9de20dad3f352db34fba6ade93c]]]]
Former-commit-id: 29ba337367
Former-commit-id: fa5e160245 [formerly 4796beec29] [formerly 4d7e2eae126edb00fa4f829dd78950b4c1bcb955 [formerly 4887054146]]
Former-commit-id: d0dd309b0a417a6444396ea3b859924e5cfdca56 [formerly b147653a66]
Former-commit-id: d0ef42d528
2014-01-20 17:21:21 -06:00
Brad Gonzales
ff5b2e2828 Issue #2678 Better fix for sbn retrieval queue init to null in wfo. Fix for bandwith graph data retrieve of sbn data.
Amend:  updated commit comment in BandwidthGraphData.

Change-Id: Ic77130425e495330fe670086e5bbfad35e7b9287

Former-commit-id: 63da94f3dc [formerly 061884910d] [formerly 0635a368c6] [formerly 63da94f3dc [formerly 061884910d] [formerly 0635a368c6] [formerly 6b8da117e4 [formerly 0635a368c6 [formerly 253b19d5cd1c7950209521a708b5ad9abbf000f6]]]]
Former-commit-id: 6b8da117e4
Former-commit-id: 3ef7702171 [formerly f7e01e3083] [formerly a182b86137b110215d3d58d0237c3557bf44940d [formerly 8e307a22e6]]
Former-commit-id: 714a90c9158fac2d94677863af23542f0bb19219 [formerly d5e7eaab4e]
Former-commit-id: 5ae1d35965
2014-01-20 13:08:27 -06:00
Mike Duff
67bab78c2f Issue #2459 - Remove unscheduled status from UI
Former-commit-id: e6efbf5663 [formerly 0cfa9ee36c] [formerly 93cb80cfc7] [formerly e6efbf5663 [formerly 0cfa9ee36c] [formerly 93cb80cfc7] [formerly 25d1d39fc2 [formerly 93cb80cfc7 [formerly ddbef8fd122a6be6c32ff9a58659e712c2912a07]]]]
Former-commit-id: 25d1d39fc2
Former-commit-id: 5097ed2ad7 [formerly a492ec6a4d] [formerly 77ea703f0626d7ff1caa2689bf5deb3e8b0b0c00 [formerly a04430e334]]
Former-commit-id: 8d18315d712b7d954433a4d91c196a329a74eeaa [formerly dcb5b4a111]
Former-commit-id: 45bef29f75
2014-01-17 15:34:48 -06:00
Brad Gonzales
6da79298ba Issue #2678 fix for sbn retrieval agent subscription queue. init it as null because sbn ingest is from ingest messages.
Amend: Because of the files used specifically for InMemoryBandwidthManagerManager, added the SBN RetrievalPlan back to WFO.

Change-Id: Ibebd89a2dd0236c47e8060489eb67bec9fc8d583

Former-commit-id: 27058db803 [formerly b3f9678dba] [formerly e308f2a6ee] [formerly 27058db803 [formerly b3f9678dba] [formerly e308f2a6ee] [formerly ee4dc7068b [formerly e308f2a6ee [formerly b0c2fcb5e802815b886f669b633e516b022b55a3]]]]
Former-commit-id: ee4dc7068b
Former-commit-id: 944ed64e23 [formerly 3f4785f450] [formerly 4a53586a2d54c19cc9cd2854de59c103a46a5b94 [formerly 31705fddf5]]
Former-commit-id: 2f50828eb412b19f7462819430cd863812b3bcee [formerly 7bb44e47ba]
Former-commit-id: d2629887bf
2014-01-16 16:54:12 -06:00
Nate Jensen
9081058ca2 Merge "Issue #2459 - Refactor the subscription status" into omaha_14.2.1
Former-commit-id: 26ce19331e [formerly 9028260386] [formerly ae10129713] [formerly 26ce19331e [formerly 9028260386] [formerly ae10129713] [formerly 9d529b3b21 [formerly ae10129713 [formerly 61b073cef0bfe65634096221d8ee8aef37f9e1ed]]]]
Former-commit-id: 9d529b3b21
Former-commit-id: 9f4360fdda [formerly 98e1bf9194] [formerly 194b6af74ffb08201bff51fb4de3ff2d6d3448d9 [formerly 1be41d69c6]]
Former-commit-id: d4f72fd00fd9496a9587b235b75d9efcd7bc6b81 [formerly 3d6d9118ea]
Former-commit-id: 86b9311ed4
2014-01-15 17:36:30 -06:00
Brad Gonzales
69f2e8a94a Issue #2678 Fix for multiple threads grabbing a retrieval for processing.
Change-Id: I1e982d4db4d4f68531b8b9c65e7070bff3825c28

Former-commit-id: dd09d84c73 [formerly a2fbcecef6] [formerly 3e3fcfa9af] [formerly dd09d84c73 [formerly a2fbcecef6] [formerly 3e3fcfa9af] [formerly 46a2a5f70f [formerly 3e3fcfa9af [formerly 3d396223b93631f0ea561a4df8ae9a3d71dde767]]]]
Former-commit-id: 46a2a5f70f
Former-commit-id: 26c902d957 [formerly 7e608842b2] [formerly 4a9c736666cc3f62be99481509da930add8b7094 [formerly a1429a3911]]
Former-commit-id: 89b9939480bd370d75e57032e518294ed0d2c802 [formerly d2fac3ed56]
Former-commit-id: 15bcc55822
2014-01-15 17:16:47 -06:00
Dave Hladky
216d1afd3b Issue #2679 Multiple regions for a single collector mapped to single WFS source
Change-Id: I1e4b1eefe5f507742805886292ba67b24f40f34c

Former-commit-id: bdaf00a48a [formerly eddceed756] [formerly 08625addba] [formerly bdaf00a48a [formerly eddceed756] [formerly 08625addba] [formerly c57c27c843 [formerly 08625addba [formerly b888d311923ba0628fa015018ef2f62fce47fb43]]]]
Former-commit-id: c57c27c843
Former-commit-id: 5cc337003a [formerly 9d136bb7d8] [formerly edd648771874f35130649ae7bc594cfa8f6feda0 [formerly 6069bb90c7]]
Former-commit-id: 5b10a19969ade1327d8d6bec3588ab1fed144fda [formerly abd5127160]
Former-commit-id: 097c4379f0
2014-01-15 10:05:20 -06:00
Mike Duff
5ea95dbca9 Issue #2459 - Refactor the subscription status
Former-commit-id: 43810aa5f5 [formerly d03c012a54] [formerly f94593867e] [formerly 43810aa5f5 [formerly d03c012a54] [formerly f94593867e] [formerly 245d76358e [formerly f94593867e [formerly 3ab5b072627d0a8b0eabe12fb700f6a74319b5f9]]]]
Former-commit-id: 245d76358e
Former-commit-id: c5f28e0f37 [formerly 9a45b95db6] [formerly ebd7027d07dcf26d5e0b30ecd0d661a72afa18e1 [formerly d96a9d2937]]
Former-commit-id: 86f4629abcfe03116c78ec209c22d6df91eac0b9 [formerly 3c0634b1e8]
Former-commit-id: c8f7edbcad
2014-01-15 09:21:30 -06:00
Dave Hladky
8f841bfd4b Issue #2692 Fixed non-notification of adhoc's due to incorrect lookup of subscription.
Former-commit-id: 19cbf638a6 [formerly 56b0f4274d] [formerly fee9c183f9] [formerly 19cbf638a6 [formerly 56b0f4274d] [formerly fee9c183f9] [formerly 8a6a386410 [formerly fee9c183f9 [formerly 339245a534bf2da5071536e959086d5e4f7b2bf0]]]]
Former-commit-id: 8a6a386410
Former-commit-id: c2bb3ee199 [formerly 5cf9c5bd1c] [formerly a001b689127d9b92213eb6050018ef7a8258e0a4 [formerly 79e5b19f31]]
Former-commit-id: 745af6f55324ec395ec49d15edf5bdbb524c063c [formerly 6a708e4cd6]
Former-commit-id: 30516610ca
2014-01-14 15:29:15 -06:00
Mike Duff
18410979ad Issue #2636 - Removed apache Equals and Hashcode builder, using eclipse generated versions.
Former-commit-id: c6f92e9207 [formerly 2a1f84b72d] [formerly 92b404f6ec] [formerly c6f92e9207 [formerly 2a1f84b72d] [formerly 92b404f6ec] [formerly 9e817de4a9 [formerly 92b404f6ec [formerly 605f5a0a496deeb9be0e3aed1a56f6ac816038b4]]]]
Former-commit-id: 9e817de4a9
Former-commit-id: e395071beb [formerly 850ee18fd4] [formerly 7d5d1b7a0fc09fb10c44af68831e25eff4f1f078 [formerly fc3dec0591]]
Former-commit-id: 909234f65172df27de3f168396ee4a8c42517053 [formerly ac6e032f8a]
Former-commit-id: fa7989b047
2014-01-13 09:25:34 -06:00
Brad Gonzales
d5d66b8731 Issue #2615 Refactored Subscription valid time period calculation from BandwidthDaoUtil to
RecurringSubscription.  Add environment configuration files to unit tests setup.  Changed the
devRegistry debug port to the same port as registry.

Amend: Updates from peer review.

Change-Id: I4f5a25d4667dc949804b86541a9d9428728b779a

Former-commit-id: 2c0c6fbcc7 [formerly 8eeb3dc412] [formerly 4537513df7] [formerly 2c0c6fbcc7 [formerly 8eeb3dc412] [formerly 4537513df7] [formerly 343a2495e5 [formerly 4537513df7 [formerly 33a3dead503276926af71d7355f87242f5250e54]]]]
Former-commit-id: 343a2495e5
Former-commit-id: 6868d8d12d [formerly f57529be9b] [formerly 1b6fea4b1e1ad9152e19bb26118b1df57cd9ade0 [formerly 4049af9630]]
Former-commit-id: 2c41b1048f19e32de7cfb868829f77a4d1b22782 [formerly 8b362ee404]
Former-commit-id: b8c7be1225
2014-01-10 16:37:09 -06:00
Richard Peter
bc1e10f36a Merge "Issue #2636 - change log statements, add missing copyright headers" into omaha_14.2.1
Former-commit-id: 550b40a4bf [formerly 60f22e2d4c] [formerly 48184fe695] [formerly 550b40a4bf [formerly 60f22e2d4c] [formerly 48184fe695] [formerly 51c8919ea7 [formerly 48184fe695 [formerly 974e2fb98c17fe843025346954d727fb9d72a408]]]]
Former-commit-id: 51c8919ea7
Former-commit-id: b3059957bc [formerly b15476b43e] [formerly dc61c2e1e5f79882b6b9ca4a2f583310cd1d52df [formerly cf2c9c530c]]
Former-commit-id: 284b584c447ab7562f63b4361478a798656ec303 [formerly d4316a7dca]
Former-commit-id: fbb62b2ec8
2014-01-10 15:42:08 -06:00
Mike Duff
ad46fbe905 Issue #2684 - BandwidthUtil bean now depends on registerDataDeliveryHandlers bean
Change-Id: I6f491e7e14e445b59e93f5896eedde3062246034

Former-commit-id: 696003d463 [formerly 26e34bb4d1] [formerly b50ea7b162] [formerly 696003d463 [formerly 26e34bb4d1] [formerly b50ea7b162] [formerly 744d7367dc [formerly b50ea7b162 [formerly 12500574ade0eced65454ff981b83f8f729cd125]]]]
Former-commit-id: 744d7367dc
Former-commit-id: 6440aa8375 [formerly 3274c591bf] [formerly bbcc98303dcc89e98466e092b86268e5c8a053c9 [formerly 0e5332e8cd]]
Former-commit-id: 33bf17f1fd1ffd937bbb693a2081cf16c68bcf78 [formerly d3557c33d0]
Former-commit-id: b471106692
2014-01-10 12:14:27 -06:00
Mike Duff
a35c24280c Issue #2636 - change log statements, add missing copyright headers
Former-commit-id: 8fe7d83f6f [formerly 8993103c45] [formerly 12a8618c42] [formerly 8fe7d83f6f [formerly 8993103c45] [formerly 12a8618c42] [formerly 3be3a8ac0d [formerly 12a8618c42 [formerly 8bf5a8185c09e9d368afc8e8e7409222164159aa]]]]
Former-commit-id: 3be3a8ac0d
Former-commit-id: ae88e49e26 [formerly ea07460e3e] [formerly 7b4e8fc0dd59dffc07172aea3397179483206f25 [formerly e121eb5dbd]]
Former-commit-id: 510296653b6e3a1f298a2c560e342f6652c2854b [formerly 9c4eaabf29]
Former-commit-id: cdd2e23eb6
2014-01-10 10:55:17 -06:00
Mike Duff
f5d13adc34 Issue #2636 - Fix data set availability offset. Now uses average offset of last 10 data set matches
Former-commit-id: 99d7e51456 [formerly 30b65a4fe7] [formerly 183ca614df] [formerly 99d7e51456 [formerly 30b65a4fe7] [formerly 183ca614df] [formerly a264cb06a1 [formerly 183ca614df [formerly b841e795f2a18bf902ec373c9f79b191db177fde]]]]
Former-commit-id: a264cb06a1
Former-commit-id: f6d58f7615 [formerly 05b6508299] [formerly 1723170c25ee5bf976e58a1096d080a768d79925 [formerly 4620b69f08]]
Former-commit-id: eda2ee87762a8696e1f7816588a6c03614038065 [formerly 4bd12c488b]
Former-commit-id: 621bbe5ce6
2014-01-09 10:29:21 -06:00
Brad Gonzales
8fd73a5cd9 Issue #2645 Prevent the recurring time in SubscriptionNotifyTask from being killed by an exception
thrown from run.  Fix issue where the InMemoryBandwidthBucketAllocationAssociator was not updating the in memory allocation
when the db value status was updated.  Added RegistryBandwidthRecord to the list of classes to init by HibernateBandwidthDbInit.
Updates to hibernate.cfg.xml for Richard.

Change-Id: I0eb7b0a34e48f6b8db8065dee45966c48ef38617

Former-commit-id: c05358aac5 [formerly 02910c2a8c] [formerly 07a4420596] [formerly c05358aac5 [formerly 02910c2a8c] [formerly 07a4420596] [formerly 12860c79f9 [formerly 07a4420596 [formerly e0dbe59a7dc418e3b8ed62396b6ef2047b5990fd]]]]
Former-commit-id: 12860c79f9
Former-commit-id: ad3da98af6 [formerly 5c85734e02] [formerly 53dd09e9f01677738d8bb7bceaf559f45f59115c [formerly be6f12e9c2]]
Former-commit-id: d63be2574bfe21dc4708216b7f896c519c9d925a [formerly a1ee60d16d]
Former-commit-id: 44cff7514d
2014-01-08 13:37:17 -06:00
Brad Gonzales
2fd6d50617 Issue #2636 fixes for the scheduling gaps in the middle of subscription schedules.
Amend: Added max checks to prevent negative bucket sizes in RetrievalPlan remove methods.  Wrapped debug logging in is debug on checks.

Change-Id: I5ab6d3c103e82bf2b1aa0eaf167f0993e5778c90

Former-commit-id: 8e26f2a99c [formerly 253cc9df80] [formerly cc75442fa3] [formerly 8e26f2a99c [formerly 253cc9df80] [formerly cc75442fa3] [formerly b2b352a5ae [formerly cc75442fa3 [formerly 3db5d79b914436b8d0feed600fc586d7d3884706]]]]
Former-commit-id: b2b352a5ae
Former-commit-id: 38198d379b [formerly 6e78d3a521] [formerly b11a7f8006104e7102802aa4735db3bf8c3aaff8 [formerly 0df42dacfd]]
Former-commit-id: d94d9163be833c49e9da0c0ffbb86ce778b60899 [formerly 4f6b8a79bb]
Former-commit-id: f71ea9eeb4
2013-12-17 11:57:06 -06:00
Brad Gonzales
af8b8cf0f5 Issue #2635 Remove unneeded retrieval plan plan for sbn data on the wfo.
Change-Id: Icb4ce20d0fa5c8bfc8af90020bbdcade0c396168

Former-commit-id: b4b51de862 [formerly d329fc26bb] [formerly d324400d65] [formerly b4b51de862 [formerly d329fc26bb] [formerly d324400d65] [formerly d0ae47d053 [formerly d324400d65 [formerly f4c1739687685a22847a09490724e84825032146]]]]
Former-commit-id: d0ae47d053
Former-commit-id: 413d6e83d3 [formerly 729ab5d41e] [formerly 230f64f02e7a5999b7f549e68cba93e994622dda [formerly 8476a13e41]]
Former-commit-id: 71ca5ec5cbf790259ccbbf23ade4ec069ca5e700 [formerly f0f1abea6b]
Former-commit-id: b12fc921a5
2013-12-17 09:43:12 -06:00
Mike Duff
7fb8d4e9b4 Issue #2545 - Prevent negatvie values in the BandwidthBucket's current size
Former-commit-id: 4a34562b6d [formerly 685c07cde0] [formerly b310cf0388] [formerly 4a34562b6d [formerly 685c07cde0] [formerly b310cf0388] [formerly eb591030d8 [formerly b310cf0388 [formerly f68aaea220b8ad7dcc886bb3bdeab362b977061e]]]]
Former-commit-id: eb591030d8
Former-commit-id: d4008334a7 [formerly ee5788ae5f] [formerly 9481ed3c4c2ed1bd3c5d860228b7afb95c3be678 [formerly 0deef9b6dd]]
Former-commit-id: 106a3ad6aefe02408a13e23349f5401e61cb3900 [formerly 4127267b78]
Former-commit-id: d8787f7eba
2013-12-13 16:03:36 -06:00
Brad Gonzales
fdcc2662ed Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations.
Change-Id: Ie9eb7e3e1a5bc8ac4a8ccf9532686d97f584bf1c

Former-commit-id: 1c027db49b [formerly 6515d6a9e5] [formerly 112649eff2] [formerly 1c027db49b [formerly 6515d6a9e5] [formerly 112649eff2] [formerly 96dc3b65b1 [formerly 112649eff2 [formerly 14171c13dd5f127df0b90a5db9a9e11b301ffc5f]]]]
Former-commit-id: 96dc3b65b1
Former-commit-id: d81e245314 [formerly 3f5c25ff46] [formerly 0737955a8aef371ea08edc7e3c56b368da7ef030 [formerly 79efc3b53a]]
Former-commit-id: e67bd70c6a9e5e09b6487895962e3b3c7f1b2bd3 [formerly 133918fba6]
Former-commit-id: 7d479d8a73
2013-12-11 17:06:41 -06:00
Brad Gonzales
77b9816a0a Issue #2566 fix bandwidthmanager spring file resource resolution.
Change-Id: I533b39782454083411c65c3a1f721ca26a0d9731

Former-commit-id: 31930d262d [formerly 419230d6db] [formerly 5dd466e22a] [formerly 31930d262d [formerly 419230d6db] [formerly 5dd466e22a] [formerly cfa7128be2 [formerly 5dd466e22a [formerly c12676830e66cf8e18f10e835c0f95e25074d992]]]]
Former-commit-id: cfa7128be2
Former-commit-id: 919cea89ce [formerly 71d6ef856a] [formerly 548da1be7aa44a46bdb6fe06ce610a6d4f4e0449 [formerly 531c598e3b]]
Former-commit-id: 3fd1bec52252bdbebc894c0ddae7167d46581eb4 [formerly dbd7f3cc37]
Former-commit-id: ee8cbe414c
2013-12-11 11:19:40 -06:00
Brad Gonzales
d1fa8c738b Issue #2566 Refactored BandwidthManagerCreators to load spring files using Executor.extractSpringFiles.
Amend: Refactored Executor static modes specific methods into a EDEXModesUtil class in
       the edex.core.modes package.  Move EdexMode, DefaultEdexMode, and EdexModesContainer
       to the same package.

Change-Id: Ib6af9557ca8d875c5eff162b46bf56e2c041e0fb

Former-commit-id: 310597d856 [formerly 3d34764022] [formerly 410a00c72a] [formerly 310597d856 [formerly 3d34764022] [formerly 410a00c72a] [formerly 72df38075f [formerly 410a00c72a [formerly 76a844ed3158bcc80dc0d4b751cad83d39fcbbc4]]]]
Former-commit-id: 72df38075f
Former-commit-id: fa097589d0 [formerly e18f7b2380] [formerly d6d85c281b70c2e07827f44bc42368ab797e8062 [formerly c54fe467a3]]
Former-commit-id: e96fbe2c0a9f49c38dbe9b9eb76448f730afdb58 [formerly 3d592d0b38]
Former-commit-id: 143e160eae
2013-12-05 15:17:14 -06:00
Mike Duff
6bacb944fb Issue #2545 - Get bandwidth graph data by network
Change-Id: I4de455a4da43f180ff37eb72370addec77a29314

Former-commit-id: c7345582e9 [formerly a412a19583] [formerly 4796f43495] [formerly c7345582e9 [formerly a412a19583] [formerly 4796f43495] [formerly 0c452e2434 [formerly 4796f43495 [formerly 9102f16c8a6409e92ded498b82a6a4e6a531f2c0]]]]
Former-commit-id: 0c452e2434
Former-commit-id: 802e0d360c [formerly 45cf9384d8] [formerly 0a68403f743b2b5033d96fa1433b811164defb55 [formerly 7f2ddb1360]]
Former-commit-id: 6357394278816b4bba40d3a8336a9f549bcbbad8 [formerly d3c5ee0468]
Former-commit-id: 0885df1d3f
2013-12-05 13:35:31 -06:00
Dave Hladky
4d222b0a16 Issue #1736 Add registry bandwidth tracking
Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6

Former-commit-id: bce11dec14 [formerly 6607e5fe30] [formerly 483ec5d22f] [formerly bce11dec14 [formerly 6607e5fe30] [formerly 483ec5d22f] [formerly 593f24023d [formerly 483ec5d22f [formerly 695365c03ac142960a22e6774f3a10fd5e16cd35]]]]
Former-commit-id: 593f24023d
Former-commit-id: 36f601253e [formerly 09aa3a6c62] [formerly 035f4702c002daa8199c28c0d3ad1c8b496bd6ab [formerly 4060748634]]
Former-commit-id: f25d919b9119ff63b128cb8bcb67039b0f6d8ae8 [formerly dc5f5f3c87]
Former-commit-id: 25745e2782
2013-12-04 11:58:49 -06:00
Brad Gonzales
10773a487c Issue #2448 Fixed problem that set subscription start time to first cycle time.
Fixed problem that set subscription end time to end of day.

Change-Id: Icccdbe4e38581f5194f6fde8d52f280d1a456a65

Former-commit-id: c27778c4df [formerly c7959336f5] [formerly 93b47ce68b] [formerly c27778c4df [formerly c7959336f5] [formerly 93b47ce68b] [formerly d2cfc5986a [formerly 93b47ce68b [formerly d8040be0d01c11fc7bfafe40a7afe509ba372ea0]]]]
Former-commit-id: d2cfc5986a
Former-commit-id: e28ac634ee [formerly 4a83ff7971] [formerly 76f67795d1d943ade561899bea989a7a700107d8 [formerly 04d7bff784]]
Former-commit-id: 3cf69f16b9d575da662eec2f98764311030c0804 [formerly 70f66e5f7a]
Former-commit-id: 65eefe2846
2013-11-20 15:49:27 -06:00
Brad Gonzales
ef39175130 Issue #2545 Renamed datadelivery edex impl files to facilitate modes exclusion. Added
monilithic impl config file for a registry that runs as an ncf and wfo for devRegistry mode.  Added empty site and
shared and local subscription handlers to enable the FindSubscriptionHandler bean to be configured through spring.
Fix for re-routing Insert and Update registry events as data set metadata events which was lost when the registry
was configured to distinguish between insert and update events.  Moved subscriptionRoutesToSchedule bean (and other
beans specific to an implementation) to the ncf, wfo, and monolithic edex impl spring files.  Removed the wfo and
ncf specific code from HibernateBandwidthInitializer.executeAfterRegistryInit() since the customized subscription
handlers will be injected through spring.  Removed the SBN route from wfo mode.

Amend: Comment updates from peer review.

Change-Id: Ic4c0dca8ebf1e86537e46a6231af58bb65c83cf8

Former-commit-id: 2f37534433 [formerly 5576ac6134] [formerly 053f20c70b] [formerly 2f37534433 [formerly 5576ac6134] [formerly 053f20c70b] [formerly 95a1914c71 [formerly 053f20c70b [formerly c245f741b9e78d8e4503698336d9929536e72e0d]]]]
Former-commit-id: 95a1914c71
Former-commit-id: 3aa399c82e [formerly 3c86e33ea4] [formerly 19437f081eb72b80741e738e53af17b271610621 [formerly 04829d37e2]]
Former-commit-id: abd02052274cc3ea864a223c7ac89c12b10c3e19 [formerly 6e19c4dab1]
Former-commit-id: fc4850d7b2
2013-11-20 11:58:33 -06:00
Brad Gonzales
d72d725ba7 Issue #2545 EdexBandwidthManager check for subsription event types before sending notifications.
Added missing comma to com.raytheon.edex.plugin.text.

Change-Id: Ifc970d31d8f2db29dc5a4749967cdedad84b6162

Former-commit-id: 437c29c7f4 [formerly 938683ba4d] [formerly aa8fb36fc1] [formerly 437c29c7f4 [formerly 938683ba4d] [formerly aa8fb36fc1] [formerly 53d4de12d9 [formerly aa8fb36fc1 [formerly f570f6fcd64a96b7c61eecdfae6a765ec643e718]]]]
Former-commit-id: 53d4de12d9
Former-commit-id: 66a8a30092 [formerly 4ec5ee7f74] [formerly e3193236411f9e577590904b1ee3e08e4ab9ffd5 [formerly 490c95d010]]
Former-commit-id: e7ce2920a68b4911c5e309cad65b7a703bffe97b [formerly 4499a8d1de]
Former-commit-id: 2c7e62ee89
2013-11-15 08:00:47 -06:00
Richard Peter
b4e255a976 Merge "Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes." into development
Former-commit-id: 8214774545 [formerly c25ba19514] [formerly 9af1de07d4] [formerly 8214774545 [formerly c25ba19514] [formerly 9af1de07d4] [formerly f12839a9e5 [formerly 9af1de07d4 [formerly 116b4409d4657b5dba8c9e3e52e2198661cb9691]]]]
Former-commit-id: f12839a9e5
Former-commit-id: 51f9a7fe54 [formerly 502d67591b] [formerly d63f1f5f4506e36003ebe3658bbae7045d51f7d9 [formerly c8ff79a7f5]]
Former-commit-id: a6a02709b082eebc1c33d818028dc638fba6569a [formerly 0cf51fce74]
Former-commit-id: 7855a8f000
2013-11-12 13:47:04 -06:00
Nate Jensen
fddb55dc4d Merge "Issue #2448 fix scheduling for start/stop of subscription." into development
Former-commit-id: 05068bb1f3 [formerly db61d36b4e] [formerly 88af1ddfcb] [formerly 05068bb1f3 [formerly db61d36b4e] [formerly 88af1ddfcb] [formerly 64aa00bad6 [formerly 88af1ddfcb [formerly 12c5fff1cc460acc0f800edf0597a5b7aecb5cbb]]]]
Former-commit-id: 64aa00bad6
Former-commit-id: f673de2e99 [formerly 7a5f716d70] [formerly 9e53a2808b9310818f353602936e9b93270e44e7 [formerly 39679b0608]]
Former-commit-id: 31537865a0c927339a6d678895ead733e422918e [formerly f618186c69]
Former-commit-id: db3a33864f
2013-11-12 12:46:38 -06:00
Brad Gonzales
0aa3b220bf Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes.
Amend: Separate update from create notifications in LifecycleManagerImpl.
       Refactored notification sending in EdexBandwidthManager.
       Fixed error in LifecycleManagerImpl refactor.
       Added comment to isRecurringSubscription.

Change-Id: Idc9e8544b156fed40d6aed41511c07138f302f77

Former-commit-id: 50fb18601c [formerly 62e4cafa27] [formerly 8f70fb1d0c] [formerly 50fb18601c [formerly 62e4cafa27] [formerly 8f70fb1d0c] [formerly aea0e847aa [formerly 8f70fb1d0c [formerly 7684f7bd51770a41e68700f1d4408a6aad5cd877]]]]
Former-commit-id: aea0e847aa
Former-commit-id: 725742f4ec [formerly 7747d901f7] [formerly 690f66cc7e89cdd24f8b28a0befbcc33117dfd20 [formerly 866a11a9f0]]
Former-commit-id: 0b81bcbc6ab893fa04a28ec2f1a491d80e5eeec8 [formerly bad9b3242a]
Former-commit-id: a626b240ce
2013-11-12 12:42:16 -06:00
Dave Hladky
5b4297b398 Issue #2448 fix scheduling for start/stop of subscription.
Former-commit-id: af66d970dd [formerly efa18426a1] [formerly b6f1468b7e] [formerly af66d970dd [formerly efa18426a1] [formerly b6f1468b7e] [formerly 976eece1b1 [formerly b6f1468b7e [formerly de110d3747096601a122f64cc5d6037823213e92]]]]
Former-commit-id: 976eece1b1
Former-commit-id: 3d5ca2453b [formerly 3f5b80e5b3] [formerly 18e585f452f18b7b112c96e0494390595d97c58e [formerly 753b36cfea]]
Former-commit-id: 2fbe443c2e385e5f4ebf6922d2f5d909c21e1fcc [formerly e410d1f44b]
Former-commit-id: 6a9c0a6fa8
2013-11-12 10:58:50 -06:00
Brad Gonzales
3c70ba2cb4 Issue #2506 Added subscription notification service to bandwidth manager.
Change-Id: I3aad52887532f9a16dd6ea396458803890916d92

Former-commit-id: 2cc78d880e [formerly cbdb9dfb4f] [formerly cd221e5263] [formerly 2cc78d880e [formerly cbdb9dfb4f] [formerly cd221e5263] [formerly ff5edde334 [formerly cd221e5263 [formerly 2466ae66d5a3acb6b5c5f5be482db30d3b3653bd]]]]
Former-commit-id: ff5edde334
Former-commit-id: 66d22943ed [formerly 1987184f87] [formerly 368a51ec44c83075967d0b8589b3b09c44ba8b74 [formerly efdc64b7b3]]
Former-commit-id: 4f74e3c469450a036eb47f21a5ab1ff474af8c5c [formerly 1b084e4efa]
Former-commit-id: b7fca60f7d
2013-11-12 10:50:06 -06:00
Brad Gonzales
afe5db430d Issue #2506 fixed issues with shared distributed ingest.
Amend: Updated comment in StoreRetrievedData.
       Removed separate messageing to clear BandwidthSubscriptions.
       Add fix and test case for SBN deserialization with content following the ending xml tag.
       Removed unneeded changes.
       Added XmlWMOMessage class.

Change-Id: Iadef7070a42a10661ba9316a4900a071820296fd

Former-commit-id: 3c24f30ae8 [formerly 80fd8a2ad4] [formerly fe15e874f7] [formerly 3c24f30ae8 [formerly 80fd8a2ad4] [formerly fe15e874f7] [formerly e2fb158757 [formerly fe15e874f7 [formerly 0b667fbd94788a8a5b598ae5f5586d4b710518a4]]]]
Former-commit-id: e2fb158757
Former-commit-id: 458698d0a2 [formerly e802b866dd] [formerly d52ca16c4b5860cf95891f8b6102ecc6f6d96bd1 [formerly 28d8aa5151]]
Former-commit-id: 59d91bce9376593b0a8507fe193efa14b5311c75 [formerly f017bee2f2]
Former-commit-id: 837664eea1
2013-11-08 15:29:05 -06:00
Dave Hladky
04e5a53386 Issue #2521 DatasetMetaData URL update failure for point data.
Change-Id: I3421bb6acdc3f44ef7341279c0b253acea2e59ea

Former-commit-id: 96ea2d36b6 [formerly bade1cd3bd] [formerly 0a331e84ed] [formerly 96ea2d36b6 [formerly bade1cd3bd] [formerly 0a331e84ed] [formerly ef1efac63c [formerly 0a331e84ed [formerly 4821b94172554f98496a59f0d688a3edb5a43a63]]]]
Former-commit-id: ef1efac63c
Former-commit-id: 0b45a7a439 [formerly 8f459c229f] [formerly 0f57eef863b63bcc36dd3d3eddc5e25a2e8ab3ac [formerly 100786338a]]
Former-commit-id: 7a33d0e6e20b4b3dbeb5e23f1c01ab4a928383a1 [formerly dc4e4ac4d0]
Former-commit-id: d41abda3c8
2013-11-05 15:19:42 -06:00
Dave Hladky
128a7c3854 Issue #2448 Fixed retrievals before activePeriod begins and after activePeriod expires.
Change-Id: I75269bad24731990720d30683ebf5f27344661f3

Former-commit-id: f79ba58a3a [formerly 0eba787d3e] [formerly 4227f3a59f] [formerly f79ba58a3a [formerly 0eba787d3e] [formerly 4227f3a59f] [formerly 9161962813 [formerly 4227f3a59f [formerly 060e719f27c20f24bae9a5603cc51d90434b8fa4]]]]
Former-commit-id: 9161962813
Former-commit-id: ea17726866 [formerly ba31efaf03] [formerly cc3ebf4fc7bd5a908a51ab6d7ccbfde59ee5656b [formerly d55d68fe5a]]
Former-commit-id: 94e7a513a18ed9462a0201d4dece78d3907851ba [formerly 85003bf022]
Former-commit-id: e30272c56b
2013-11-01 08:23:16 -05:00
Benjamin Phillippe
1ac4adb3f8 Issue #2385 Fixed subscription backup web service. Restored subscriptions are now scheduled in the bandwidth manager
Change-Id: I7e0e98517ff7d2213957004c6a94e38cf7063cce

Former-commit-id: 9a8c43a777 [formerly 127b5a3b70] [formerly be09ba9fcf] [formerly 9a8c43a777 [formerly 127b5a3b70] [formerly be09ba9fcf] [formerly 0905d6ffdd [formerly be09ba9fcf [formerly 40fec1c49a0a4aa2ecb4afdf4cf225e6359efd28]]]]
Former-commit-id: 0905d6ffdd
Former-commit-id: 1664af6b9d [formerly a169585a0a] [formerly df866e1f5581eb7f04abe632e8f4bbc1bb498f33 [formerly 041ce07803]]
Former-commit-id: cd8ce79be8fa7373e019fcc9468a531ce8935c43 [formerly d938f48197]
Former-commit-id: 9cc9dc3e9c
2013-10-24 11:51:11 -05:00