Merge changes #26
Merged
Merge changes #26
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…xed and improved devices.html. Modified DeviceManagementController so that the '/monitor/device' endpoint returns the devices of the current user, and also plain users can retrieve info for the devices they own.
…device-view.html, for better viewing
…Added DeviceStatusUpdate class used in DeviceMonitorService, and added field statusUpdate in Device class. Restructured and improved ResourceDiscoveryProperties.
…ring code). Renamed DeviceMonitorService to DeviceStatusMonitorService and made it subclass of AbstractMonitorService. Changed DeviceStatusUpdate class to ignore unknown properties during deserialization.
…ted Device class to store device metrics received from EMS
…ice status in devices.html
…ls serialized (and returned to browser). Also updated the affected code
…other request or a registered device)
…tials. Fixed RegistrationRequest in order to have its 'messages' and 'history' fields copied by BeanUtils. Fixed 2 bugs in RegistrationRequestProcessor and added a few more logs.
…end of the device metrics list
…evice status and metrics) [WIP]
…rvice classes for handling reinstall and uninstall actions (via EMS broker). Moved LC request event sending from DeviceManagementService to DeviceLifeCycleRequestService. Updated ResourceDiscoveryProperties with settings for DeviceLifeCycleRequest/ResponseService's.
…evices. Added configurable immediate archiving of Success registration requests, and off-boarded devices, and added relevant settings in ResourceDiscoveryProperties and in GUI.
…chived-request-view.html. Updated archived.html
…ers) to access their device info (and archived devices), and control re-installing and off-boarding. Added device colouring based on their status.
… Added SUSPECT and FAILED statues in DeviceStatus (and in devices.html and archived.html for colouring). Added relevant settings in ResourceDiscoveryProperties. Fixed a few naming errors.
Small improvement in getting device registration details See merge request nebulous-project/resource-discovery!6
# Conflicts: # resource-discovery/src/main/java/eu/nebulous/resource/discovery/registration/service/SALRegistrationService.java
# Conflicts: # resource-discovery/src/main/java/eu/nebulous/resource/discovery/registration/service/SALRegistrationService.java
# Conflicts: # resource-discovery/src/main/java/eu/nebulous/resource/discovery/registration/service/SALRegistrationService.java
…S_AUTHORIZE, and ALWAYS_REJECT)
RD: Made device on-boarding authorization configurable (MANUAL,... See merge request nebulous-project/resource-discovery!9
…oarding request to EMS
# Conflicts: # resource-discovery/src/main/java/eu/nebulous/resource/discovery/registration/service/SALRegistrationService.java
Improved amqp support See merge request nebulous-project/resource-discovery!10
- Addition of provider field in device registration - Small improvements the Synchronous Broker publisher
# Conflicts: # resource-discovery/src/main/java/eu/nebulous/resource/discovery/broker_communication/BrokerPublisher.java
# Conflicts: # resource-discovery/src/main/java/eu/nebulous/resource/discovery/broker_communication/BrokerPublisher.java
# Conflicts: # resource-discovery/src/main/java/eu/nebulous/resource/discovery/broker_communication/BrokerPublisher.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.