From 36e1b10d3e69535fb73380b9df3033a754ace997 Mon Sep 17 00:00:00 2001 From: Claudio Bisegni <Claudio.Bisegni@lnf.infn.it> Date: Mon, 21 Aug 2017 14:51:09 +0200 Subject: [PATCH] renamed the ChaosMetadataServiceClient root directory in chaos_metadata_service_client. now all library used lowercase way for root directory name --- CHAOSFramework.xcodeproj/project.pbxproj | 162 +-------- CMakeLists.txt | 2 +- .../nbproject/configurations.xml | 310 ------------------ .../nbproject/project.xml | 26 -- .../HandlerMonitor.cpp | 2 +- .../HandlerMonitor.h | 2 +- .../NodeMonitor.cpp | 2 +- ChaosMetadataServiceClientTest/NodeMonitor.h | 2 +- .../NodeMonitorHandlerTest.h | 2 +- .../NodeSearchTest.cpp | 2 +- ChaosMetadataServiceClientTest/main.cpp | 2 +- ccs/MainController.cpp | 2 +- ccs/api_async_processor/ApiAsyncProcessor.h | 2 +- ccs/api_async_processor/ApiAsyncRunnable.h | 2 +- ccs/api_async_processor/ApiHandler.h | 2 +- ccs/api_async_processor/ApiSubmitter.h | 2 +- ccs/data/ChaosAbstractDataSetTableModel.h | 2 +- ccs/data/ChaosByteArray.h | 2 +- ccs/data/CommandListModel.h | 2 +- ccs/data/CommandParameterTableModel.h | 2 +- ccs/data/CommandTemplateListModel.h | 2 +- ccs/data/ControlUnitStateVaribleListModel.h | 2 +- ccs/data/DatasetAttributeListModel.h | 2 +- ccs/data/LogDataTableModel.h | 2 +- ccs/data/LogEntryTableModel.h | 2 +- ccs/data/LogProcessEntriesTableModel.h | 2 +- ccs/data/ScriptInstanceListModel.h | 2 +- ccs/data/SearchNodeListModel.cpp | 2 +- ccs/metatypes.h | 2 +- .../handler/AbstractAttributeHandler.h | 2 +- .../AbstractTSTaggedAttributeHandler.h | 2 +- .../handler/MonitorBinaryAttributeHandler.h | 2 +- .../handler/MonitorBoolAttributeHandler.h | 2 +- .../handler/MonitorDoubleAttributeHandler.h | 2 +- .../handler/MonitorInt32AttributeHandler.h | 2 +- .../handler/MonitorInt64AttributeHandler.h | 2 +- .../handler/MonitorStringAttributeHandler.h | 2 +- .../MonitorTSTaggedBinaryAttributeHandler.h | 2 +- .../MonitorTSTaggedDoubleAttributeHandler.h | 2 +- .../MonitorTSTaggedInt32AttributeHandler.h | 2 +- .../MonitorTSTaggedInt64AttributeHandler.h | 2 +- .../MonitorTSTaggedStringAttributeHandler.h | 2 +- .../MonitorTSTaggetBoolAttributeHandler.h | 2 +- .../SystemControlUnitRunScheduleDelay.h | 2 +- ccs/monitor/healt/HealtPresenterWidget.cpp | 2 +- .../ControlUnitCommandTemplateEditor.h | 2 +- ccs/plot/BufferPlot.h | 2 +- ccs/plot/NodeAttributePlotting.h | 2 +- ccs/preference/PreferenceManager.cpp | 2 +- ccs/presenter/PresenterWidget.h | 2 +- ccs/script/CreateNewScriptDialog.h | 2 +- ccs/snapshot/NodeInSnapshotTableModel.h | 2 +- ccs/snapshot/SnapshotTableModel.h | 2 +- ccs/tree_group/DomainListModel.h | 2 +- ccs/tree_group/GroupTreeItem.cpp | 2 +- ccs/tree_group/GroupTreeModel.cpp | 2 +- ccs/widget/ChaosLabel.h | 2 +- chaos/common/io/IODataDriver.h | 2 +- .../CMakeLists.txt | 28 +- .../ChaosMetadataServiceClient.cpp | 19 +- .../ChaosMetadataServiceClient.h | 23 +- .../api_proxy/ApiProxy.cpp | 2 +- .../api_proxy/ApiProxy.h | 2 +- .../api_proxy/ApiProxyManager.cpp | 12 +- .../api_proxy/ApiProxyManager.h | 8 +- .../agent/CheckAgentHostedProcess.cpp | 2 +- .../api_proxy/agent/CheckAgentHostedProcess.h | 2 +- .../agent/GetManagementConfiguration.cpp | 2 +- .../agent/GetManagementConfiguration.h | 2 +- .../api_proxy/agent/ListNodeForAgent.cpp | 2 +- .../api_proxy/agent/ListNodeForAgent.h | 2 +- .../api_proxy/agent/LoadAgentDescription.cpp | 2 +- .../api_proxy/agent/LoadAgentDescription.h | 2 +- .../api_proxy/agent/LoadNodeAssociation.cpp | 2 +- .../api_proxy/agent/LoadNodeAssociation.h | 2 +- .../api_proxy/agent/NodeOperation.cpp | 2 +- .../api_proxy/agent/NodeOperation.h | 2 +- .../api_proxy/agent/RemoveNodeAssociation.cpp | 2 +- .../api_proxy/agent/RemoveNodeAssociation.h | 2 +- .../api_proxy/agent/SaveNodeAssociation.cpp | 2 +- .../api_proxy/agent/SaveNodeAssociation.h | 2 +- .../agent/SetManagementConfiguration.cpp | 2 +- .../agent/SetManagementConfiguration.h | 2 +- .../api_proxy/agent/agent.h | 22 +- .../agent/logging/GetProcessLogEntries.cpp | 2 +- .../agent/logging/GetProcessLogEntries.h | 2 +- .../agent/logging/ManageNodeLogging.cpp | 2 +- .../agent/logging/ManageNodeLogging.h | 2 +- .../api_proxy/api.h | 22 +- .../api_proxy/api_types.h | 0 .../api_proxy/control_unit/CopyInstance.cpp | 2 +- .../api_proxy/control_unit/CopyInstance.h | 2 +- .../api_proxy/control_unit/Delete.cpp | 2 +- .../api_proxy/control_unit/Delete.h | 2 +- .../api_proxy/control_unit/DeleteInstance.cpp | 4 +- .../api_proxy/control_unit/DeleteInstance.h | 2 +- .../control_unit/GetCurrentDataset.cpp | 4 +- .../control_unit/GetCurrentDataset.h | 2 +- .../api_proxy/control_unit/GetInstance.cpp | 4 +- .../api_proxy/control_unit/GetInstance.h | 2 +- .../api_proxy/control_unit/InitDeinit.cpp | 2 +- .../api_proxy/control_unit/InitDeinit.h | 2 +- .../api_proxy/control_unit/RecoverError.cpp | 2 +- .../api_proxy/control_unit/RecoverError.h | 2 +- .../control_unit/SearchInstancesByUS.cpp | 4 +- .../control_unit/SearchInstancesByUS.h | 2 +- .../SetInputDatasetAttributeValues.cpp | 2 +- .../SetInputDatasetAttributeValues.h | 2 +- .../control_unit/SetInstanceDescription.cpp | 2 +- .../control_unit/SetInstanceDescription.h | 2 +- .../api_proxy/control_unit/StartStop.cpp | 4 +- .../api_proxy/control_unit/StartStop.h | 2 +- .../api_proxy/control_unit/control_unit.h | 22 +- .../data_service/AssociationControlUnit.cpp | 4 +- .../data_service/AssociationControlUnit.h | 2 +- .../api_proxy/data_service/DeleteDS.cpp | 4 +- .../api_proxy/data_service/DeleteDS.h | 2 +- .../api_proxy/data_service/GetAllDS.cpp | 4 +- .../api_proxy/data_service/GetAllDS.h | 2 +- .../data_service/GetAssociationByDS.cpp | 4 +- .../data_service/GetAssociationByDS.h | 2 +- .../data_service/GetBestEndpoints.cpp | 4 +- .../api_proxy/data_service/GetBestEndpoints.h | 2 +- .../api_proxy/data_service/NewDS.cpp | 4 +- .../api_proxy/data_service/NewDS.h | 2 +- .../api_proxy/data_service/UpdateDS.cpp | 4 +- .../api_proxy/data_service/UpdateDS.h | 2 +- .../api_proxy/data_service/data_service.h | 14 +- .../api_proxy/deploy/EndUploadSession.cpp | 2 +- .../api_proxy/deploy/EndUploadSession.h | 2 +- .../api_proxy/deploy/StartUploadSession.cpp | 2 +- .../api_proxy/deploy/StartUploadSession.h | 2 +- .../api_proxy/deploy/UploadChunk.cpp | 2 +- .../api_proxy/deploy/UploadChunk.h | 2 +- .../api_proxy/deploy/deploy.h | 6 +- .../api_proxy/groups/AddNode.cpp | 2 +- .../api_proxy/groups/AddNode.h | 4 +- .../api_proxy/groups/DeleteNode.cpp | 2 +- .../api_proxy/groups/DeleteNode.h | 2 +- .../api_proxy/groups/GetDomains.cpp | 2 +- .../api_proxy/groups/GetDomains.h | 2 +- .../api_proxy/groups/GetNodeChilds.cpp | 2 +- .../api_proxy/groups/GetNodeChilds.h | 2 +- .../api_proxy/groups/groups.h | 8 +- .../logging/GetLogDomainForSourceUID.cpp | 2 +- .../logging/GetLogDomainForSourceUID.h | 4 +- .../api_proxy/logging/GetLogForSourceUID.cpp | 2 +- .../api_proxy/logging/GetLogForSourceUID.h | 4 +- .../api_proxy/logging/SearchLogEntry.cpp | 2 +- .../api_proxy/logging/SearchLogEntry.h | 6 +- .../api_proxy/logging/logging.h | 6 +- .../api_proxy/logging/logging_types.h | 0 .../api_proxy/node/ChangeNodeState.cpp | 4 +- .../api_proxy/node/ChangeNodeState.h | 2 +- .../api_proxy/node/CommandGet.cpp | 2 +- .../api_proxy/node/CommandGet.h | 2 +- .../api_proxy/node/CommandInstanceSubmit.cpp | 0 .../api_proxy/node/CommandInstanceSubmit.h | 0 .../api_proxy/node/CommandTemplateDelete.cpp | 2 +- .../api_proxy/node/CommandTemplateDelete.h | 2 +- .../api_proxy/node/CommandTemplateGet.cpp | 2 +- .../api_proxy/node/CommandTemplateGet.h | 2 +- .../api_proxy/node/CommandTemplateSearch.cpp | 2 +- .../api_proxy/node/CommandTemplateSearch.h | 2 +- .../api_proxy/node/CommandTemplateSet.cpp | 2 +- .../api_proxy/node/CommandTemplateSet.h | 2 +- .../api_proxy/node/CommandTemplateSubmit.cpp | 2 +- .../api_proxy/node/CommandTemplateSubmit.h | 2 +- .../node/GetCommandAndTemplateDescription.cpp | 0 .../node/GetCommandAndTemplateDescription.h | 2 +- .../api_proxy/node/GetNodeDescription.cpp | 4 +- .../api_proxy/node/GetNodeDescription.h | 2 +- .../api_proxy/node/NodeSearch.cpp | 2 +- .../api_proxy/node/NodeSearch.h | 2 +- .../api_proxy/node/UpdateProperty.cpp | 2 +- .../api_proxy/node/UpdateProperty.h | 2 +- .../api_proxy/node/node.h | 22 +- .../api_proxy/script/LoadFullScript.cpp | 2 +- .../api_proxy/script/LoadFullScript.h | 2 +- .../api_proxy/script/ManageScriptInstance.cpp | 2 +- .../api_proxy/script/ManageScriptInstance.h | 2 +- .../api_proxy/script/RemoveScript.cpp | 2 +- .../api_proxy/script/RemoveScript.h | 2 +- .../api_proxy/script/SaveScript.cpp | 2 +- .../api_proxy/script/SaveScript.h | 2 +- .../script/SearchInstancesForScript.cpp | 2 +- .../script/SearchInstancesForScript.h | 2 +- .../api_proxy/script/SearchScript.cpp | 2 +- .../api_proxy/script/SearchScript.h | 2 +- .../api_proxy/script/UpdateBindType.cpp | 2 +- .../api_proxy/script/UpdateBindType.h | 2 +- .../api_proxy/script/UpdateScriptOnNode.cpp | 2 +- .../api_proxy/script/UpdateScriptOnNode.h | 2 +- .../api_proxy/script/script.h | 16 +- .../api_proxy/service/CreateNewSnapshot.cpp | 2 +- .../api_proxy/service/CreateNewSnapshot.h | 2 +- .../api_proxy/service/DeleteSnapshot.cpp | 4 +- .../api_proxy/service/DeleteSnapshot.h | 2 +- .../api_proxy/service/GetAllSnapshot.cpp | 2 +- .../api_proxy/service/GetAllSnapshot.h | 2 +- .../api_proxy/service/GetNodesForSnapshot.cpp | 2 +- .../api_proxy/service/GetNodesForSnapshot.h | 2 +- .../service/GetSnapshotDatasetForNode.cpp | 2 +- .../service/GetSnapshotDatasetForNode.h | 2 +- .../api_proxy/service/GetSnapshotForNode.cpp | 2 +- .../api_proxy/service/GetSnapshotForNode.h | 2 +- .../api_proxy/service/GetVariable.cpp | 2 +- .../api_proxy/service/GetVariable.h | 2 +- .../api_proxy/service/RemoveVariable.cpp | 2 +- .../api_proxy/service/RemoveVariable.h | 2 +- .../api_proxy/service/ResetAll.cpp | 4 +- .../api_proxy/service/ResetAll.h | 2 +- .../api_proxy/service/RestoreSnapshot.cpp | 2 +- .../api_proxy/service/RestoreSnapshot.h | 2 +- .../service/SetSnapshotDatasetsForNode.cpp | 2 +- .../service/SetSnapshotDatasetsForNode.h | 2 +- .../api_proxy/service/SetVariable.cpp | 2 +- .../api_proxy/service/SetVariable.h | 2 +- .../api_proxy/service/service.h | 20 +- .../api_proxy/unit_server/DeleteUS.cpp | 2 +- .../api_proxy/unit_server/DeleteUS.h | 2 +- .../api_proxy/unit_server/GetDescription.cpp | 2 +- .../api_proxy/unit_server/GetDescription.h | 2 +- .../unit_server/GetSetFullUnitServer.cpp | 2 +- .../unit_server/GetSetFullUnitServer.h | 2 +- .../unit_server/LoadUnloadControlUnit.cpp | 2 +- .../unit_server/LoadUnloadControlUnit.h | 2 +- .../api_proxy/unit_server/ManageCUType.cpp | 2 +- .../api_proxy/unit_server/ManageCUType.h | 2 +- .../api_proxy/unit_server/NewUS.cpp | 2 +- .../api_proxy/unit_server/NewUS.h | 2 +- .../api_proxy/unit_server/unit_server.h | 8 +- .../event/AbstractEventHandler.cpp | 4 +- .../event/AbstractEventHandler.h | 0 .../event/EventDispatchManager.cpp | 6 +- .../event/EventDispatchManager.h | 4 +- .../alert/AlertAgentCheckProcessHandler.cpp | 2 +- .../alert/AlertAgentCheckProcessHandler.h | 2 +- .../event/alert/AlertEventHandler.cpp | 2 +- .../event/alert/AlertEventHandler.h | 2 +- .../event/alert/AlertLogEventHandler.cpp | 4 +- .../event/alert/AlertLogEventHandler.h | 2 +- .../event/event.h | 10 +- .../metadata_service_client_constants.h | 0 .../metadata_service_client_types.h | 0 .../AbstractQuantumKeyAttributeHandler.cpp | 2 +- .../AbstractQuantumKeyAttributeHandler.h | 2 +- .../monitor_system/MonitorManager.cpp | 2 +- .../monitor_system/MonitorManager.h | 8 +- .../monitor_system/QuantumKeyConsumer.cpp | 0 .../monitor_system/QuantumKeyConsumer.h | 4 +- .../monitor_system/QuantumSlot.cpp | 2 +- .../monitor_system/QuantumSlot.h | 2 +- .../monitor_system/QuantumSlotScheduler.cpp | 2 +- .../monitor_system/QuantumSlotScheduler.h | 4 +- .../QuantumTSTaggedAttributeHandler.cpp | 2 +- .../QuantumTSTaggedAttributeHandler.h | 4 +- .../handler/HealtHeartbeatAttributeHandler.h | 2 +- .../handler/HealtStatusAttributeHandler.h | 2 +- .../monitor_system/monitor_system.h | 18 +- .../monitor_system/monitor_system_types.h | 0 .../node_controller/CUController.cpp | 62 +--- .../node_controller/CUController.h | 9 +- .../node_monitor/ControlUnitController.cpp | 4 +- .../node_monitor/ControlUnitController.h | 2 +- .../ControlUnitMonitorHandler.cpp | 4 +- .../node_monitor/ControlUnitMonitorHandler.h | 2 +- .../node_monitor/NodeController.cpp | 3 +- .../node_monitor/NodeController.h | 4 +- .../node_monitor/NodeFetcher.cpp | 3 +- .../node_monitor/NodeFetcher.h | 6 +- .../node_monitor/NodeMonitor.cpp | 13 +- .../node_monitor/NodeMonitor.h | 17 +- .../node_monitor/NodeMonitorHandler.cpp | 2 +- .../node_monitor/NodeMonitorHandler.h | 2 +- .../node_monitor/node_monitor.h | 14 +- .../node_monitor/node_monitor_types.h | 0 chaos_micro_unit_toolkit/CMakeLists.txt | 12 +- 278 files changed, 459 insertions(+), 1006 deletions(-) delete mode 100644 ChaosMetadataServiceClient/nbproject/configurations.xml delete mode 100644 ChaosMetadataServiceClient/nbproject/project.xml rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/CMakeLists.txt (86%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/ChaosMetadataServiceClient.cpp (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/ChaosMetadataServiceClient.h (92%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/ApiProxy.cpp (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/ApiProxy.h (98%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/ApiProxyManager.cpp (83%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/ApiProxyManager.h (91%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/CheckAgentHostedProcess.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/CheckAgentHostedProcess.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/GetManagementConfiguration.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/GetManagementConfiguration.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/ListNodeForAgent.cpp (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/ListNodeForAgent.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/LoadAgentDescription.cpp (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/LoadAgentDescription.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/LoadNodeAssociation.cpp (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/LoadNodeAssociation.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/NodeOperation.cpp (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/NodeOperation.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/RemoveNodeAssociation.cpp (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/RemoveNodeAssociation.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/SaveNodeAssociation.cpp (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/SaveNodeAssociation.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/SetManagementConfiguration.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/SetManagementConfiguration.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/agent.h (50%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/logging/GetProcessLogEntries.cpp (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/logging/GetProcessLogEntries.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/logging/ManageNodeLogging.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/agent/logging/ManageNodeLogging.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/api.h (53%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/api_types.h (100%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/CopyInstance.cpp (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/CopyInstance.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/Delete.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/Delete.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/DeleteInstance.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/DeleteInstance.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/GetCurrentDataset.cpp (93%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/GetCurrentDataset.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/GetInstance.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/GetInstance.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/InitDeinit.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/InitDeinit.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/RecoverError.cpp (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/RecoverError.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/SearchInstancesByUS.cpp (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/SearchInstancesByUS.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/SetInputDatasetAttributeValues.cpp (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/SetInputDatasetAttributeValues.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/SetInstanceDescription.cpp (98%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/SetInstanceDescription.h (99%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/StartStop.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/StartStop.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/control_unit/control_unit.h (51%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/data_service/AssociationControlUnit.cpp (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/data_service/AssociationControlUnit.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/data_service/DeleteDS.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/data_service/DeleteDS.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/data_service/GetAllDS.cpp (93%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/data_service/GetAllDS.h (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/data_service/GetAssociationByDS.cpp (93%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/data_service/GetAssociationByDS.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/data_service/GetBestEndpoints.cpp (93%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/data_service/GetBestEndpoints.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/data_service/NewDS.cpp (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/data_service/NewDS.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/data_service/UpdateDS.cpp (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/data_service/UpdateDS.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/data_service/data_service.h (62%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/deploy/EndUploadSession.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/deploy/EndUploadSession.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/deploy/StartUploadSession.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/deploy/StartUploadSession.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/deploy/UploadChunk.cpp (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/deploy/UploadChunk.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/deploy/deploy.h (80%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/groups/AddNode.cpp (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/groups/AddNode.h (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/groups/DeleteNode.cpp (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/groups/DeleteNode.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/groups/GetDomains.cpp (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/groups/GetDomains.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/groups/GetNodeChilds.cpp (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/groups/GetNodeChilds.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/groups/groups.h (76%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/logging/GetLogDomainForSourceUID.cpp (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/logging/GetLogDomainForSourceUID.h (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/logging/GetLogForSourceUID.cpp (98%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/logging/GetLogForSourceUID.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/logging/SearchLogEntry.cpp (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/logging/SearchLogEntry.h (93%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/logging/logging.h (79%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/logging/logging_types.h (100%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/ChangeNodeState.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/ChangeNodeState.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/CommandGet.cpp (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/CommandGet.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/CommandInstanceSubmit.cpp (100%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/CommandInstanceSubmit.h (100%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/CommandTemplateDelete.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/CommandTemplateDelete.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/CommandTemplateGet.cpp (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/CommandTemplateGet.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/CommandTemplateSearch.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/CommandTemplateSearch.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/CommandTemplateSet.cpp (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/CommandTemplateSet.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/CommandTemplateSubmit.cpp (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/CommandTemplateSubmit.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/GetCommandAndTemplateDescription.cpp (100%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/GetCommandAndTemplateDescription.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/GetNodeDescription.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/GetNodeDescription.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/NodeSearch.cpp (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/NodeSearch.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/UpdateProperty.cpp (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/UpdateProperty.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/node/node.h (51%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/script/LoadFullScript.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/script/LoadFullScript.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/script/ManageScriptInstance.cpp (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/script/ManageScriptInstance.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/script/RemoveScript.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/script/RemoveScript.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/script/SaveScript.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/script/SaveScript.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/script/SearchInstancesForScript.cpp (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/script/SearchInstancesForScript.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/script/SearchScript.cpp (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/script/SearchScript.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/script/UpdateBindType.cpp (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/script/UpdateBindType.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/script/UpdateScriptOnNode.cpp (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/script/UpdateScriptOnNode.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/script/script.h (60%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/CreateNewSnapshot.cpp (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/CreateNewSnapshot.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/DeleteSnapshot.cpp (93%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/DeleteSnapshot.h (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/GetAllSnapshot.cpp (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/GetAllSnapshot.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/GetNodesForSnapshot.cpp (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/GetNodesForSnapshot.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/GetSnapshotDatasetForNode.cpp (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/GetSnapshotDatasetForNode.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/GetSnapshotForNode.cpp (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/GetSnapshotForNode.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/GetVariable.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/GetVariable.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/RemoveVariable.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/RemoveVariable.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/ResetAll.cpp (93%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/ResetAll.h (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/RestoreSnapshot.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/RestoreSnapshot.h (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/SetSnapshotDatasetsForNode.cpp (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/SetSnapshotDatasetsForNode.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/SetVariable.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/SetVariable.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/service/service.h (55%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/unit_server/DeleteUS.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/unit_server/DeleteUS.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/unit_server/GetDescription.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/unit_server/GetDescription.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/unit_server/GetSetFullUnitServer.cpp (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/unit_server/GetSetFullUnitServer.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/unit_server/LoadUnloadControlUnit.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/unit_server/LoadUnloadControlUnit.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/unit_server/ManageCUType.cpp (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/unit_server/ManageCUType.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/unit_server/NewUS.cpp (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/unit_server/NewUS.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/api_proxy/unit_server/unit_server.h (74%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/event/AbstractEventHandler.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/event/AbstractEventHandler.h (100%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/event/EventDispatchManager.cpp (93%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/event/EventDispatchManager.h (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/event/alert/AlertAgentCheckProcessHandler.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/event/alert/AlertAgentCheckProcessHandler.h (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/event/alert/AlertEventHandler.cpp (93%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/event/alert/AlertEventHandler.h (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/event/alert/AlertLogEventHandler.cpp (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/event/alert/AlertLogEventHandler.h (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/event/event.h (70%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/metadata_service_client_constants.h (100%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/metadata_service_client_types.h (100%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/monitor_system/AbstractQuantumKeyAttributeHandler.cpp (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/monitor_system/AbstractQuantumKeyAttributeHandler.h (99%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/monitor_system/MonitorManager.cpp (99%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/monitor_system/MonitorManager.h (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/monitor_system/QuantumKeyConsumer.cpp (100%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/monitor_system/QuantumKeyConsumer.h (93%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/monitor_system/QuantumSlot.cpp (98%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/monitor_system/QuantumSlot.h (98%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/monitor_system/QuantumSlotScheduler.cpp (99%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/monitor_system/QuantumSlotScheduler.h (98%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/monitor_system/QuantumTSTaggedAttributeHandler.cpp (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/monitor_system/QuantumTSTaggedAttributeHandler.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/monitor_system/handler/HealtHeartbeatAttributeHandler.h (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/monitor_system/handler/HealtStatusAttributeHandler.h (94%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/monitor_system/monitor_system.h (51%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/monitor_system/monitor_system_types.h (100%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/node_controller/CUController.cpp (88%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/node_controller/CUController.h (99%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/node_monitor/ControlUnitController.cpp (98%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/node_monitor/ControlUnitController.h (98%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/node_monitor/ControlUnitMonitorHandler.cpp (93%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/node_monitor/ControlUnitMonitorHandler.h (95%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/node_monitor/NodeController.cpp (99%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/node_monitor/NodeController.h (96%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/node_monitor/NodeFetcher.cpp (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/node_monitor/NodeFetcher.h (93%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/node_monitor/NodeMonitor.cpp (88%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/node_monitor/NodeMonitor.h (83%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/node_monitor/NodeMonitorHandler.cpp (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/node_monitor/NodeMonitorHandler.h (97%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/node_monitor/node_monitor.h (61%) rename {ChaosMetadataServiceClient => chaos_metadata_service_client}/node_monitor/node_monitor_types.h (100%) diff --git a/CHAOSFramework.xcodeproj/project.pbxproj b/CHAOSFramework.xcodeproj/project.pbxproj index 6eef0c431..3d1ff6a02 100644 --- a/CHAOSFramework.xcodeproj/project.pbxproj +++ b/CHAOSFramework.xcodeproj/project.pbxproj @@ -1131,7 +1131,6 @@ 32F7FEA118A4FD9B00FC03AB /* DirectIOEndpointHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 32F7FEA018A4FD9B00FC03AB /* DirectIOEndpointHandler.h */; }; 32F7FEAB18A5066600FC03AB /* FastDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 32F7FEA218A5066600FC03AB /* FastDelegate.h */; }; 32F7FEAC18A5066600FC03AB /* FastDelegateBind.h in Headers */ = {isa = PBXBuildFile; fileRef = 32F7FEA318A5066600FC03AB /* FastDelegateBind.h */; }; - 32F9C79C1E81943F00D4B250 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32F9C79B1E81943F00D4B250 /* main.cpp */; }; 32F9F8121D8FD45A0023948D /* CronousManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32F9F8101D8FD45A0023948D /* CronousManager.cpp */; }; 32F9F8131D8FD45A0023948D /* CronousManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 32F9F8111D8FD45A0023948D /* CronousManager.h */; }; 32F9F8161D8FD7030023948D /* CronJob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32F9F8141D8FD7030023948D /* CronJob.cpp */; }; @@ -1298,15 +1297,6 @@ ); runOnlyForDeploymentPostprocessing = 1; }; - 32F9C7971E81943F00D4B250 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; - files = ( - ); - runOnlyForDeploymentPostprocessing = 1; - }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -2694,7 +2684,6 @@ 32F7FEA018A4FD9B00FC03AB /* DirectIOEndpointHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectIOEndpointHandler.h; sourceTree = "<group>"; }; 32F7FEA218A5066600FC03AB /* FastDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FastDelegate.h; sourceTree = "<group>"; }; 32F7FEA318A5066600FC03AB /* FastDelegateBind.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FastDelegateBind.h; sourceTree = "<group>"; }; - 32F9C7991E81943F00D4B250 /* CouchTest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = CouchTest; sourceTree = BUILT_PRODUCTS_DIR; }; 32F9C79B1E81943F00D4B250 /* main.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; }; 32F9F8101D8FD45A0023948D /* CronousManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CronousManager.cpp; sourceTree = "<group>"; }; 32F9F8111D8FD45A0023948D /* CronousManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CronousManager.h; sourceTree = "<group>"; }; @@ -2875,13 +2864,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 32F9C7961E81943F00D4B250 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -3659,7 +3641,7 @@ 329C1F101B58F46700A84D55 /* CMakeLists.txt */, 326DB3B114B38BC00018A8D0 /* chaos */, 32A40D421A9CD4A0000D9A35 /* chaos_service_common */, - 32661C6A1AA73DA200F1A721 /* ChaosMetadataServiceClient */, + 32661C6A1AA73DA200F1A721 /* chaos_metadata_service_client */, 324D08941F30CD7A00836E29 /* chaos_micro_unit_toolkit */, 323236C9164573C60052CE06 /* ChaosMetadataService */, 3264139A1E44ACE60035E175 /* ChaosAgent */, @@ -3675,7 +3657,6 @@ 32661C661AA73D5B00F1A721 /* libchaos_metadata_service_client.dylib */, 322085DA1AC5A0E100F1B71A /* ChaosMetadataServiceClientTest */, 326413991E44ACE60035E175 /* ChaosAgent */, - 32F9C7991E81943F00D4B250 /* CouchTest */, 324D08931F30CD7A00836E29 /* libchaos_micro_unit_toolkit.dylib */, 324D08DF1F321B4800836E29 /* ChaosMicroUnitToolkitTest */, ); @@ -3851,7 +3832,7 @@ path = api; sourceTree = "<group>"; }; - 32661C6A1AA73DA200F1A721 /* ChaosMetadataServiceClient */ = { + 32661C6A1AA73DA200F1A721 /* chaos_metadata_service_client */ = { isa = PBXGroup; children = ( 32661C721AA76EEB00F1A721 /* CMakeLists.txt */, @@ -3865,7 +3846,7 @@ 3274A9081AC2F18E000C6A4D /* api_proxy */, 3274A9091AC2F1CD000C6A4D /* monitor_system */, ); - path = ChaosMetadataServiceClient; + path = chaos_metadata_service_client; sourceTree = "<group>"; }; 3268CE261616081000FCDB10 /* zmq */ = { @@ -6545,23 +6526,6 @@ productReference = 32C7EAD41A5D9E450008DFE8 /* ChaosWANProxy */; productType = "com.apple.product-type.tool"; }; - 32F9C7981E81943F00D4B250 /* CouchTest */ = { - isa = PBXNativeTarget; - buildConfigurationList = 32F9C79F1E81943F00D4B250 /* Build configuration list for PBXNativeTarget "CouchTest" */; - buildPhases = ( - 32F9C7951E81943F00D4B250 /* Sources */, - 32F9C7961E81943F00D4B250 /* Frameworks */, - 32F9C7971E81943F00D4B250 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = CouchTest; - productName = CouchTest; - productReference = 32F9C7991E81943F00D4B250 /* CouchTest */; - productType = "com.apple.product-type.tool"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -6598,10 +6562,6 @@ 32C7EAD31A5D9E450008DFE8 = { CreatedOnToolsVersion = 6.1; }; - 32F9C7981E81943F00D4B250 = { - CreatedOnToolsVersion = 8.1; - ProvisioningStyle = Automatic; - }; }; }; buildConfigurationList = 3260261014B300FE00C906CE /* Build configuration list for PBXProject "CHAOSFramework" */; @@ -6624,10 +6584,9 @@ 323236C6164573C60052CE06 /* ChaosMetadataService */, 326413981E44ACE60035E175 /* ChaosAgent */, 322085D91AC5A0E100F1B71A /* ChaosMetadataServiceClientTest */, + 324D08DE1F321B4800836E29 /* ChaosMicroUnitToolkitTest */, 32C7EAD31A5D9E450008DFE8 /* ChaosWANProxy */, - 32F9C7981E81943F00D4B250 /* CouchTest */, 3211C65B1C146200003B38BF /* Compile ALL */, - 324D08DE1F321B4800836E29 /* ChaosMicroUnitToolkitTest */, ); }; /* End PBXProject section */ @@ -7331,14 +7290,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 32F9C7951E81943F00D4B250 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 32F9C79C1E81943F00D4B250 /* main.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -8340,102 +8291,6 @@ }; name = Release; }; - 32F9C79D1E81943F00D4B250 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_SUSPICIOUS_MOVES = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - CONFIGURATION_BUILD_DIR = "$(SRCROOT)/usr/local/bin"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.12; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_LDFLAGS = ( - "-lcouchbase", - "-lchaos_common", - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; - }; - name = Debug; - }; - 32F9C79E1E81943F00D4B250 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_SUSPICIOUS_MOVES = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - CONFIGURATION_BUILD_DIR = "$(SRCROOT)/usr/local/bin"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.12; - MTL_ENABLE_DEBUG_INFO = NO; - OTHER_LDFLAGS = ( - "-lcouchbase", - "-lchaos_common", - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -8547,15 +8402,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 32F9C79F1E81943F00D4B250 /* Build configuration list for PBXNativeTarget "CouchTest" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 32F9C79D1E81943F00D4B250 /* Debug */, - 32F9C79E1E81943F00D4B250 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 3260260D14B300FE00C906CE /* Project object */; diff --git a/CMakeLists.txt b/CMakeLists.txt index 95d00f9f5..213861b0f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,7 +65,7 @@ IF (CHAOS_MDS) ENDIF() MESG("Configure Chaos Metadata Service Client Library") -ADD_SUBDIRECTORY(ChaosMetadataServiceClient) +ADD_SUBDIRECTORY(chaos_metadata_service_client) MESG("Configure Chaos Metadata Service Client Library Test Application") ADD_SUBDIRECTORY(ChaosMetadataServiceClientTest) diff --git a/ChaosMetadataServiceClient/nbproject/configurations.xml b/ChaosMetadataServiceClient/nbproject/configurations.xml deleted file mode 100644 index 02ee65ffd..000000000 --- a/ChaosMetadataServiceClient/nbproject/configurations.xml +++ /dev/null @@ -1,310 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configurationDescriptor version="95"> - <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT"> - <df root="." name="0"> - <df name="api_proxy"> - <df name="control_unit"> - <in>CopyInstance.cpp</in> - <in>Delete.cpp</in> - <in>DeleteInstance.cpp</in> - <in>GetCurrentDataset.cpp</in> - <in>GetInstance.cpp</in> - <in>InitDeinit.cpp</in> - <in>RecoverError.cpp</in> - <in>SearchInstancesByUS.cpp</in> - <in>SetInputDatasetAttributeValues.cpp</in> - <in>SetInstanceDescription.cpp</in> - <in>StartStop.cpp</in> - </df> - <df name="data_service"> - <in>AssociationControlUnit.cpp</in> - <in>DeleteDS.cpp</in> - <in>GetAllDS.cpp</in> - <in>GetAssociationByDS.cpp</in> - <in>GetBestEndpoints.cpp</in> - <in>NewDS.cpp</in> - <in>UpdateDS.cpp</in> - </df> - <df name="node"> - <in>ChangeNodeState.cpp</in> - <in>CommandGet.cpp</in> - <in>CommandInstanceSubmit.cpp</in> - <in>CommandTemplateDelete.cpp</in> - <in>CommandTemplateGet.cpp</in> - <in>CommandTemplateSearch.cpp</in> - <in>CommandTemplateSet.cpp</in> - <in>CommandTemplateSubmit.cpp</in> - <in>GetCommandAndTemplateDescription.cpp</in> - <in>GetNodeDescription.cpp</in> - <in>NodeSearch.cpp</in> - <in>UpdateProperty.cpp</in> - </df> - <df name="service"> - <in>CreateNewSnapshot.cpp</in> - <in>DeleteSnapshot.cpp</in> - <in>GetAllSnapshot.cpp</in> - <in>GetNodesForSnapshot.cpp</in> - <in>ResetAll.cpp</in> - <in>RestoreSnapshot.cpp</in> - </df> - <df name="unit_server"> - <in>DeleteUS.cpp</in> - <in>GetDescription.cpp</in> - <in>LoadUnloadControlUnit.cpp</in> - <in>ManageCUType.cpp</in> - <in>NewUS.cpp</in> - </df> - <in>ApiProxy.cpp</in> - <in>ApiProxyManager.cpp</in> - </df> - <df name="monitor_system"> - <in>AbstractQuantumKeyAttributeHandler.cpp</in> - <in>MonitorManager.cpp</in> - <in>QuantumKeyConsumer.cpp</in> - <in>QuantumSlot.cpp</in> - <in>QuantumSlotScheduler.cpp</in> - <in>QuantumTSTaggedAttributeHandler.cpp</in> - </df> - <in>ChaosMetadataServiceClient.cpp</in> - </df> - <logicalFolder name="ExternalFiles" - displayName="Important Files" - projectFiles="false" - kind="IMPORTANT_FILES_FOLDER"> - <itemPath>CMakeLists.txt</itemPath> - <itemPath>Makefile</itemPath> - </logicalFolder> - </logicalFolder> - <sourceFolderFilter>^(nbproject)$</sourceFolderFilter> - <sourceRootList> - <Elem>.</Elem> - </sourceRootList> - <projectmakefile>Makefile</projectmakefile> - <confs> - <conf name="Default" type="0"> - <toolsSet> - <compilerSet>default</compilerSet> - <dependencyChecking>false</dependencyChecking> - <rebuildPropChanged>false</rebuildPropChanged> - </toolsSet> - <codeAssistance> - </codeAssistance> - <makefileType> - <makeTool> - <buildCommandWorkingDir>.</buildCommandWorkingDir> - <buildCommand>${MAKE} -f Makefile install</buildCommand> - <cleanCommand>${MAKE} -f Makefile clean</cleanCommand> - <executablePath></executablePath> - </makeTool> - </makefileType> - <item path="ChaosMetadataServiceClient.cpp" ex="false" tool="1" flavor2="4"> - </item> - <item path="api_proxy/ApiProxy.cpp" ex="false" tool="1" flavor2="4"> - </item> - <item path="api_proxy/ApiProxyManager.cpp" ex="false" tool="1" flavor2="4"> - </item> - <item path="api_proxy/control_unit/CopyInstance.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/control_unit/Delete.cpp" ex="false" tool="1" flavor2="4"> - </item> - <item path="api_proxy/control_unit/DeleteInstance.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/control_unit/GetCurrentDataset.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/control_unit/GetInstance.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/control_unit/InitDeinit.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/control_unit/RecoverError.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/control_unit/SearchInstancesByUS.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/control_unit/SetInputDatasetAttributeValues.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/control_unit/SetInstanceDescription.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/control_unit/StartStop.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/data_service/AssociationControlUnit.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/data_service/DeleteDS.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/data_service/GetAllDS.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/data_service/GetAssociationByDS.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/data_service/GetBestEndpoints.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/data_service/NewDS.cpp" ex="false" tool="1" flavor2="4"> - </item> - <item path="api_proxy/data_service/UpdateDS.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/node/ChangeNodeState.cpp" ex="false" tool="1" flavor2="4"> - </item> - <item path="api_proxy/node/CommandGet.cpp" ex="false" tool="1" flavor2="4"> - </item> - <item path="api_proxy/node/CommandInstanceSubmit.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/node/CommandTemplateDelete.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/node/CommandTemplateGet.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/node/CommandTemplateSearch.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/node/CommandTemplateSet.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/node/CommandTemplateSubmit.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/node/GetCommandAndTemplateDescription.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/node/GetNodeDescription.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/node/NodeSearch.cpp" ex="false" tool="1" flavor2="4"> - </item> - <item path="api_proxy/node/UpdateProperty.cpp" ex="false" tool="1" flavor2="4"> - </item> - <item path="api_proxy/service/CreateNewSnapshot.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/service/DeleteSnapshot.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/service/GetAllSnapshot.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/service/GetNodesForSnapshot.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/service/ResetAll.cpp" ex="false" tool="1" flavor2="4"> - </item> - <item path="api_proxy/service/RestoreSnapshot.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/unit_server/DeleteUS.cpp" ex="false" tool="1" flavor2="4"> - </item> - <item path="api_proxy/unit_server/GetDescription.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/unit_server/LoadUnloadControlUnit.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/unit_server/ManageCUType.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="api_proxy/unit_server/NewUS.cpp" ex="false" tool="1" flavor2="4"> - </item> - <item path="monitor_system/AbstractQuantumKeyAttributeHandler.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="monitor_system/MonitorManager.cpp" ex="false" tool="1" flavor2="4"> - </item> - <item path="monitor_system/QuantumKeyConsumer.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="monitor_system/QuantumSlot.cpp" ex="false" tool="1" flavor2="4"> - </item> - <item path="monitor_system/QuantumSlotScheduler.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - <item path="monitor_system/QuantumTSTaggedAttributeHandler.cpp" - ex="false" - tool="1" - flavor2="4"> - </item> - </conf> - </confs> -</configurationDescriptor> diff --git a/ChaosMetadataServiceClient/nbproject/project.xml b/ChaosMetadataServiceClient/nbproject/project.xml deleted file mode 100644 index 68ee9ea95..000000000 --- a/ChaosMetadataServiceClient/nbproject/project.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://www.netbeans.org/ns/project/1"> - <type>org.netbeans.modules.cnd.makeproject</type> - <configuration> - <data xmlns="http://www.netbeans.org/ns/make-project/1"> - <name>ChaosMetadataServiceClient</name> - <c-extensions/> - <cpp-extensions>cpp</cpp-extensions> - <header-extensions>h</header-extensions> - <sourceEncoding>UTF-8</sourceEncoding> - <make-dep-projects/> - <sourceRootList> - <sourceRootElem>.</sourceRootElem> - </sourceRootList> - <confList> - <confElem> - <name>Default</name> - <type>0</type> - </confElem> - </confList> - <formatting> - <project-formatting-style>false</project-formatting-style> - </formatting> - </data> - </configuration> -</project> diff --git a/ChaosMetadataServiceClientTest/HandlerMonitor.cpp b/ChaosMetadataServiceClientTest/HandlerMonitor.cpp index 534ead6f1..b773e1779 100644 --- a/ChaosMetadataServiceClientTest/HandlerMonitor.cpp +++ b/ChaosMetadataServiceClientTest/HandlerMonitor.cpp @@ -56,4 +56,4 @@ void HandlerMonitor::consumeValue(const std::string& key, void HandlerMonitor::consumeValueNotFound(const std::string& key, const std::string& attribute) { //std::cout << "No data found for key:" << key << " attribute:" << attribute << std::endl; -} \ No newline at end of file +} diff --git a/ChaosMetadataServiceClientTest/HandlerMonitor.h b/ChaosMetadataServiceClientTest/HandlerMonitor.h index 085af76aa..145891018 100644 --- a/ChaosMetadataServiceClientTest/HandlerMonitor.h +++ b/ChaosMetadataServiceClientTest/HandlerMonitor.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__HandlerMonitor_h #define __CHAOSFramework__HandlerMonitor_h -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> class HandlerMonitor: public chaos::metadata_service_client::monitor_system::QuantumKeyAttributeStringHandler { diff --git a/ChaosMetadataServiceClientTest/NodeMonitor.cpp b/ChaosMetadataServiceClientTest/NodeMonitor.cpp index 152d10318..e628d657f 100644 --- a/ChaosMetadataServiceClientTest/NodeMonitor.cpp +++ b/ChaosMetadataServiceClientTest/NodeMonitor.cpp @@ -74,4 +74,4 @@ void NodeMonitor::quantumSlotHasNoData(const std::string &key){ void NodeMonitor::quantumSlotHasData(const std::string &key, const KeyValue &value){ //std::cout << key << " - " << value->getJSONString() << "\n" << std::flush; -} \ No newline at end of file +} diff --git a/ChaosMetadataServiceClientTest/NodeMonitor.h b/ChaosMetadataServiceClientTest/NodeMonitor.h index 2f0b50403..515abcbfa 100644 --- a/ChaosMetadataServiceClientTest/NodeMonitor.h +++ b/ChaosMetadataServiceClientTest/NodeMonitor.h @@ -24,7 +24,7 @@ #define CHAOS_NODEMONITOR_H #include <string> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> class NodeMonitor : public chaos::metadata_service_client::monitor_system::QuantumSlotConsumer { diff --git a/ChaosMetadataServiceClientTest/NodeMonitorHandlerTest.h b/ChaosMetadataServiceClientTest/NodeMonitorHandlerTest.h index 86d4607d1..efe39cbd2 100644 --- a/ChaosMetadataServiceClientTest/NodeMonitorHandlerTest.h +++ b/ChaosMetadataServiceClientTest/NodeMonitorHandlerTest.h @@ -9,7 +9,7 @@ #ifndef NodeMonitorHandlerTest_hpp #define NodeMonitorHandlerTest_hpp -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> class NodeMonitorHandlerTest: public chaos::metadata_service_client::node_monitor::ControlUnitMonitorHandler { diff --git a/ChaosMetadataServiceClientTest/NodeSearchTest.cpp b/ChaosMetadataServiceClientTest/NodeSearchTest.cpp index e2265a615..b19e03c4e 100644 --- a/ChaosMetadataServiceClientTest/NodeSearchTest.cpp +++ b/ChaosMetadataServiceClientTest/NodeSearchTest.cpp @@ -22,7 +22,7 @@ #include "NodeSearchTest.h" -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClientTest/main.cpp b/ChaosMetadataServiceClientTest/main.cpp index 2200b89b0..5fd60e1a1 100644 --- a/ChaosMetadataServiceClientTest/main.cpp +++ b/ChaosMetadataServiceClientTest/main.cpp @@ -22,7 +22,7 @@ #include <chaos/common/data/CDataWrapper.h> #include <chaos/common/utility/TimingUtil.h> #include <chaos/common/message/MultiAddressMessageChannel.h> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> #include <iostream> diff --git a/ccs/MainController.cpp b/ccs/MainController.cpp index 21d2c9b67..25cbb9939 100644 --- a/ccs/MainController.cpp +++ b/ccs/MainController.cpp @@ -15,7 +15,7 @@ #include <QFile> #include <QMenu> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> #include "error/ErrorManager.h" #include "node/unit_server/UnitServerEditor.h" #include "node/data_service/DataServiceEditor.h" diff --git a/ccs/api_async_processor/ApiAsyncProcessor.h b/ccs/api_async_processor/ApiAsyncProcessor.h index 8c5b2a71b..0989ddf04 100644 --- a/ccs/api_async_processor/ApiAsyncProcessor.h +++ b/ccs/api_async_processor/ApiAsyncProcessor.h @@ -6,7 +6,7 @@ #include <QThreadPool> #include <chaos/common/data/CDataWrapper.h> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> class ApiAsyncProcessor: diff --git a/ccs/api_async_processor/ApiAsyncRunnable.h b/ccs/api_async_processor/ApiAsyncRunnable.h index 3a42520a5..ed0f41c12 100644 --- a/ccs/api_async_processor/ApiAsyncRunnable.h +++ b/ccs/api_async_processor/ApiAsyncRunnable.h @@ -6,7 +6,7 @@ #include <QSharedPointer> #include <chaos/common/data/CDataWrapper.h> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> class ApiAsyncRunnable : public QObject, public QRunnable { diff --git a/ccs/api_async_processor/ApiHandler.h b/ccs/api_async_processor/ApiHandler.h index 71e747f41..687e34f3b 100644 --- a/ccs/api_async_processor/ApiHandler.h +++ b/ccs/api_async_processor/ApiHandler.h @@ -1,7 +1,7 @@ #ifndef APIHANDLER_H #define APIHANDLER_H -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> #include <QDebug> #include <QString> diff --git a/ccs/api_async_processor/ApiSubmitter.h b/ccs/api_async_processor/ApiSubmitter.h index acbe91648..3cf3d5886 100644 --- a/ccs/api_async_processor/ApiSubmitter.h +++ b/ccs/api_async_processor/ApiSubmitter.h @@ -6,7 +6,7 @@ #include <QObject> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> class ApiSubmitter: public QObject { diff --git a/ccs/data/ChaosAbstractDataSetTableModel.h b/ccs/data/ChaosAbstractDataSetTableModel.h index 5918d1b60..db59ab606 100644 --- a/ccs/data/ChaosAbstractDataSetTableModel.h +++ b/ccs/data/ChaosAbstractDataSetTableModel.h @@ -6,7 +6,7 @@ #include <QMap> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> struct AttributeInfo { int row; diff --git a/ccs/data/ChaosByteArray.h b/ccs/data/ChaosByteArray.h index e39cfb6d1..ba8346007 100644 --- a/ccs/data/ChaosByteArray.h +++ b/ccs/data/ChaosByteArray.h @@ -3,7 +3,7 @@ #include <QObject> #include <QByteArray> -#include <ChaosMetadataServiceClient/monitor_system/monitor_system.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system.h> class ChaosByteArray: public QObject { diff --git a/ccs/data/CommandListModel.h b/ccs/data/CommandListModel.h index 11c830a2d..cf0853cc5 100644 --- a/ccs/data/CommandListModel.h +++ b/ccs/data/CommandListModel.h @@ -7,7 +7,7 @@ #include <QSharedPointer> #include <chaos/common/data/CDataWrapper.h> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> class CommandListModel: public ChaosAbstractListModel { diff --git a/ccs/data/CommandParameterTableModel.h b/ccs/data/CommandParameterTableModel.h index 8837bbba3..6aeeb4c09 100644 --- a/ccs/data/CommandParameterTableModel.h +++ b/ccs/data/CommandParameterTableModel.h @@ -3,7 +3,7 @@ #include "ChaosAbstractTableModel.h" #include "AttributeValueChangeSet.h" -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> #include <QVector> diff --git a/ccs/data/CommandTemplateListModel.h b/ccs/data/CommandTemplateListModel.h index 1e864e3e3..b5c5753dd 100644 --- a/ccs/data/CommandTemplateListModel.h +++ b/ccs/data/CommandTemplateListModel.h @@ -7,7 +7,7 @@ #include <QSharedPointer> #include <chaos/common/data/CDataWrapper.h> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> class CommandTemplateListModel: public ChaosAbstractListModel { diff --git a/ccs/data/ControlUnitStateVaribleListModel.h b/ccs/data/ControlUnitStateVaribleListModel.h index 8ff4b7a31..927141586 100644 --- a/ccs/data/ControlUnitStateVaribleListModel.h +++ b/ccs/data/ControlUnitStateVaribleListModel.h @@ -3,7 +3,7 @@ #include "ChaosAbstractListModel.h" -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> #include <QVector> diff --git a/ccs/data/DatasetAttributeListModel.h b/ccs/data/DatasetAttributeListModel.h index 754ce8e6a..25d42f567 100644 --- a/ccs/data/DatasetAttributeListModel.h +++ b/ccs/data/DatasetAttributeListModel.h @@ -7,7 +7,7 @@ #include <QSharedPointer> #include <chaos/common/data/CDataWrapper.h> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> class DatasetAttributeListModel: public ChaosAbstractListModel { diff --git a/ccs/data/LogDataTableModel.h b/ccs/data/LogDataTableModel.h index 6643521ed..09c2f8ed7 100644 --- a/ccs/data/LogDataTableModel.h +++ b/ccs/data/LogDataTableModel.h @@ -3,7 +3,7 @@ #include "ChaosAbstractTableModel.h" -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> #include <QMap> #include <QPair> diff --git a/ccs/data/LogEntryTableModel.h b/ccs/data/LogEntryTableModel.h index 6b49311c2..c679418fd 100644 --- a/ccs/data/LogEntryTableModel.h +++ b/ccs/data/LogEntryTableModel.h @@ -4,7 +4,7 @@ #include "ChaosAbstractTableModel.h" #include "../api_async_processor/ApiSubmitter.h" -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> #include <string> #include <vector> diff --git a/ccs/data/LogProcessEntriesTableModel.h b/ccs/data/LogProcessEntriesTableModel.h index 2fb4447c5..1c07dacb3 100644 --- a/ccs/data/LogProcessEntriesTableModel.h +++ b/ccs/data/LogProcessEntriesTableModel.h @@ -4,7 +4,7 @@ #include "ChaosAbstractTableModel.h" #include "../api_async_processor/ApiSubmitter.h" -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> #include <string> #include <vector> diff --git a/ccs/data/ScriptInstanceListModel.h b/ccs/data/ScriptInstanceListModel.h index 2917bf9ea..049728162 100644 --- a/ccs/data/ScriptInstanceListModel.h +++ b/ccs/data/ScriptInstanceListModel.h @@ -4,7 +4,7 @@ #include "ChaosAbstractTableModel.h" #include "../api_async_processor/ApiSubmitter.h" -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> #include <QSet> diff --git a/ccs/data/SearchNodeListModel.cpp b/ccs/data/SearchNodeListModel.cpp index 957226352..4a462fb81 100644 --- a/ccs/data/SearchNodeListModel.cpp +++ b/ccs/data/SearchNodeListModel.cpp @@ -3,7 +3,7 @@ #include "delegate/TwoLineInformationItem.h" #include <QDateTime> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> #include <QMimeData> #include <QDataStream> using namespace chaos::common::data; diff --git a/ccs/metatypes.h b/ccs/metatypes.h index d2c76f64d..9f1f045bd 100644 --- a/ccs/metatypes.h +++ b/ccs/metatypes.h @@ -4,7 +4,7 @@ #include <string> #include <stdint.h> #include <QSharedPointer> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> #include "data/ChaosByteArray.h" #include "data/CommandReader.h" #include "data/CommandParameterReader.h" diff --git a/ccs/monitor/handler/AbstractAttributeHandler.h b/ccs/monitor/handler/AbstractAttributeHandler.h index cc2cdd7d5..07dd96b77 100644 --- a/ccs/monitor/handler/AbstractAttributeHandler.h +++ b/ccs/monitor/handler/AbstractAttributeHandler.h @@ -4,7 +4,7 @@ #include <QVariant> #include <QDebug> #include <QString> -#include <ChaosMetadataServiceClient/monitor_system/monitor_system.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system.h> class AbstractAttributeHandler: public QObject { diff --git a/ccs/monitor/handler/AbstractTSTaggedAttributeHandler.h b/ccs/monitor/handler/AbstractTSTaggedAttributeHandler.h index 7fbce7868..373b658fd 100644 --- a/ccs/monitor/handler/AbstractTSTaggedAttributeHandler.h +++ b/ccs/monitor/handler/AbstractTSTaggedAttributeHandler.h @@ -4,7 +4,7 @@ #include <QVariant> #include <QDebug> #include <QString> -#include <ChaosMetadataServiceClient/monitor_system/monitor_system.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system.h> class AbstractTSTaggedAttributeHandler: public QObject { diff --git a/ccs/monitor/handler/MonitorBinaryAttributeHandler.h b/ccs/monitor/handler/MonitorBinaryAttributeHandler.h index 593638396..d95457fc1 100644 --- a/ccs/monitor/handler/MonitorBinaryAttributeHandler.h +++ b/ccs/monitor/handler/MonitorBinaryAttributeHandler.h @@ -4,7 +4,7 @@ #include "AbstractAttributeHandler.h" #include "../../data/ChaosByteArray.h" #include <QSharedPointer> -#include <ChaosMetadataServiceClient/monitor_system/monitor_system.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system.h> class MonitorBinaryAttributeHandler: public AbstractAttributeHandler, diff --git a/ccs/monitor/handler/MonitorBoolAttributeHandler.h b/ccs/monitor/handler/MonitorBoolAttributeHandler.h index 51c1aa444..05be99af3 100644 --- a/ccs/monitor/handler/MonitorBoolAttributeHandler.h +++ b/ccs/monitor/handler/MonitorBoolAttributeHandler.h @@ -3,7 +3,7 @@ #include "AbstractAttributeHandler.h" -#include <ChaosMetadataServiceClient/monitor_system/monitor_system.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system.h> class MonitorBoolAttributeHandler: public AbstractAttributeHandler, diff --git a/ccs/monitor/handler/MonitorDoubleAttributeHandler.h b/ccs/monitor/handler/MonitorDoubleAttributeHandler.h index 4c14db24e..5ff55da8e 100644 --- a/ccs/monitor/handler/MonitorDoubleAttributeHandler.h +++ b/ccs/monitor/handler/MonitorDoubleAttributeHandler.h @@ -3,7 +3,7 @@ #include "AbstractAttributeHandler.h" -#include <ChaosMetadataServiceClient/monitor_system/monitor_system.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system.h> class MonitorDoubleAttributeHandler: public AbstractAttributeHandler, diff --git a/ccs/monitor/handler/MonitorInt32AttributeHandler.h b/ccs/monitor/handler/MonitorInt32AttributeHandler.h index 7df475b9f..beb5f1b84 100644 --- a/ccs/monitor/handler/MonitorInt32AttributeHandler.h +++ b/ccs/monitor/handler/MonitorInt32AttributeHandler.h @@ -4,7 +4,7 @@ #include "AbstractAttributeHandler.h" #include <QDebug> -#include <ChaosMetadataServiceClient/monitor_system/monitor_system.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system.h> class MonitorInt32AttributeHandler: public AbstractAttributeHandler, diff --git a/ccs/monitor/handler/MonitorInt64AttributeHandler.h b/ccs/monitor/handler/MonitorInt64AttributeHandler.h index 5e94cd5b2..b7794150a 100644 --- a/ccs/monitor/handler/MonitorInt64AttributeHandler.h +++ b/ccs/monitor/handler/MonitorInt64AttributeHandler.h @@ -3,7 +3,7 @@ #include "AbstractAttributeHandler.h" -#include <ChaosMetadataServiceClient/monitor_system/monitor_system.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system.h> class MonitorInt64AttributeHandler: public AbstractAttributeHandler, diff --git a/ccs/monitor/handler/MonitorStringAttributeHandler.h b/ccs/monitor/handler/MonitorStringAttributeHandler.h index 291683b13..4b7b0922f 100644 --- a/ccs/monitor/handler/MonitorStringAttributeHandler.h +++ b/ccs/monitor/handler/MonitorStringAttributeHandler.h @@ -3,7 +3,7 @@ #include "AbstractAttributeHandler.h" -#include <ChaosMetadataServiceClient/monitor_system/monitor_system.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system.h> class MonitorStringAttributeHandler: public AbstractAttributeHandler, diff --git a/ccs/monitor/handler/MonitorTSTaggedBinaryAttributeHandler.h b/ccs/monitor/handler/MonitorTSTaggedBinaryAttributeHandler.h index 27d4ef75e..12d96731b 100644 --- a/ccs/monitor/handler/MonitorTSTaggedBinaryAttributeHandler.h +++ b/ccs/monitor/handler/MonitorTSTaggedBinaryAttributeHandler.h @@ -5,7 +5,7 @@ #include "../../data/ChaosByteArray.h" #include <QObject> #include <QSharedPointer> -#include <ChaosMetadataServiceClient/monitor_system/monitor_system.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system.h> class MonitorTSTaggedBinaryAttributeHandler: diff --git a/ccs/monitor/handler/MonitorTSTaggedDoubleAttributeHandler.h b/ccs/monitor/handler/MonitorTSTaggedDoubleAttributeHandler.h index c5db02955..86ccdc7fc 100644 --- a/ccs/monitor/handler/MonitorTSTaggedDoubleAttributeHandler.h +++ b/ccs/monitor/handler/MonitorTSTaggedDoubleAttributeHandler.h @@ -3,7 +3,7 @@ #include <QObject> #include "AbstractTSTaggedAttributeHandler.h" -#include <ChaosMetadataServiceClient/monitor_system/monitor_system.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system.h> class MonitorTSTaggedDoubleAttributeHandler: public AbstractTSTaggedAttributeHandler, diff --git a/ccs/monitor/handler/MonitorTSTaggedInt32AttributeHandler.h b/ccs/monitor/handler/MonitorTSTaggedInt32AttributeHandler.h index 6e7131116..773b32aca 100644 --- a/ccs/monitor/handler/MonitorTSTaggedInt32AttributeHandler.h +++ b/ccs/monitor/handler/MonitorTSTaggedInt32AttributeHandler.h @@ -3,7 +3,7 @@ #include <QObject> #include "AbstractTSTaggedAttributeHandler.h" -#include <ChaosMetadataServiceClient/monitor_system/monitor_system.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system.h> class MonitorTSTaggedInt32AttributeHandler: public AbstractTSTaggedAttributeHandler, diff --git a/ccs/monitor/handler/MonitorTSTaggedInt64AttributeHandler.h b/ccs/monitor/handler/MonitorTSTaggedInt64AttributeHandler.h index 3081a6997..7555c46dd 100644 --- a/ccs/monitor/handler/MonitorTSTaggedInt64AttributeHandler.h +++ b/ccs/monitor/handler/MonitorTSTaggedInt64AttributeHandler.h @@ -3,7 +3,7 @@ #include <QObject> #include "AbstractTSTaggedAttributeHandler.h" -#include <ChaosMetadataServiceClient/monitor_system/monitor_system.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system.h> class MonitorTSTaggedInt64AttributeHandler: public AbstractTSTaggedAttributeHandler, diff --git a/ccs/monitor/handler/MonitorTSTaggedStringAttributeHandler.h b/ccs/monitor/handler/MonitorTSTaggedStringAttributeHandler.h index 8f4b127c1..e10837429 100644 --- a/ccs/monitor/handler/MonitorTSTaggedStringAttributeHandler.h +++ b/ccs/monitor/handler/MonitorTSTaggedStringAttributeHandler.h @@ -3,7 +3,7 @@ #include <QObject> #include "AbstractTSTaggedAttributeHandler.h" -#include <ChaosMetadataServiceClient/monitor_system/monitor_system.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system.h> class MonitorTSTaggedStringAttributeHandler: public AbstractTSTaggedAttributeHandler, diff --git a/ccs/monitor/handler/MonitorTSTaggetBoolAttributeHandler.h b/ccs/monitor/handler/MonitorTSTaggetBoolAttributeHandler.h index 3d7eea7f7..066a2c187 100644 --- a/ccs/monitor/handler/MonitorTSTaggetBoolAttributeHandler.h +++ b/ccs/monitor/handler/MonitorTSTaggetBoolAttributeHandler.h @@ -3,7 +3,7 @@ #include <QObject> #include "AbstractTSTaggedAttributeHandler.h" -#include <ChaosMetadataServiceClient/monitor_system/monitor_system.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system.h> class MonitorTSTaggedBoolAttributeHandler: public AbstractTSTaggedAttributeHandler, public chaos::metadata_service_client::monitor_system::QuantumTSTaggedBoolAttributeHandler { diff --git a/ccs/monitor/handler/system/SystemControlUnitRunScheduleDelay.h b/ccs/monitor/handler/system/SystemControlUnitRunScheduleDelay.h index f2bf77404..6a4fdca5d 100644 --- a/ccs/monitor/handler/system/SystemControlUnitRunScheduleDelay.h +++ b/ccs/monitor/handler/system/SystemControlUnitRunScheduleDelay.h @@ -1,7 +1,7 @@ #ifndef ccs_SystemControlUnitRunScheduleDelay #define ccs_SystemControlUnitRunScheduleDelay #include "../AbstractAttributeHandler.h" -#include <ChaosMetadataServiceClient/monitor_system/AbstractQuantumKeyAttributeHandler.h> +#include <chaos_metadata_service_client/monitor_system/AbstractQuantumKeyAttributeHandler.h> class SystemControlUnitRunScheduleDelay: public AbstractAttributeHandler, public chaos::metadata_service_client::monitor_system::QuantumKeyAttributeInt64Handler diff --git a/ccs/monitor/healt/HealtPresenterWidget.cpp b/ccs/monitor/healt/HealtPresenterWidget.cpp index d05e7735d..d12d87fb3 100644 --- a/ccs/monitor/healt/HealtPresenterWidget.cpp +++ b/ccs/monitor/healt/HealtPresenterWidget.cpp @@ -9,7 +9,7 @@ #include <QDebug> #include <QDateTime> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> using namespace chaos::metadata_service_client; using namespace chaos::metadata_service_client::api_proxy; diff --git a/ccs/node/control_unit/ControlUnitCommandTemplateEditor.h b/ccs/node/control_unit/ControlUnitCommandTemplateEditor.h index 42b69c6ee..a3e3986d3 100644 --- a/ccs/node/control_unit/ControlUnitCommandTemplateEditor.h +++ b/ccs/node/control_unit/ControlUnitCommandTemplateEditor.h @@ -6,7 +6,7 @@ #include <QDialog> #include <QAbstractButton> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> namespace Ui { class ControlUnitCommandTemplateEditor; diff --git a/ccs/plot/BufferPlot.h b/ccs/plot/BufferPlot.h index 6a3e4d44a..38939b320 100644 --- a/ccs/plot/BufferPlot.h +++ b/ccs/plot/BufferPlot.h @@ -5,7 +5,7 @@ #include "AbstractBinaryPlotAdapter.h" #include <chaos/common/utility/LockableObject.h> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> #include <QMap> #include <QWidget> diff --git a/ccs/plot/NodeAttributePlotting.h b/ccs/plot/NodeAttributePlotting.h index 13f4c78a0..1229ccf3f 100644 --- a/ccs/plot/NodeAttributePlotting.h +++ b/ccs/plot/NodeAttributePlotting.h @@ -11,7 +11,7 @@ #include <QSharedPointer> #include <QReadWriteLock> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> #include <boost/random.hpp> diff --git a/ccs/preference/PreferenceManager.cpp b/ccs/preference/PreferenceManager.cpp index 66e1e3079..edaf63f21 100644 --- a/ccs/preference/PreferenceManager.cpp +++ b/ccs/preference/PreferenceManager.cpp @@ -1,6 +1,6 @@ #include "PreferenceManager.h" -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> #include <QSettings> diff --git a/ccs/presenter/PresenterWidget.h b/ccs/presenter/PresenterWidget.h index 59d4406d8..3dff729bd 100644 --- a/ccs/presenter/PresenterWidget.h +++ b/ccs/presenter/PresenterWidget.h @@ -4,7 +4,7 @@ #include "../monitor/monitor.h" #include "../api_async_processor/ApiSubmitter.h" -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> #include <QMap> #include <QWidget> diff --git a/ccs/script/CreateNewScriptDialog.h b/ccs/script/CreateNewScriptDialog.h index f539cacaa..91f809593 100644 --- a/ccs/script/CreateNewScriptDialog.h +++ b/ccs/script/CreateNewScriptDialog.h @@ -2,7 +2,7 @@ #define CREATENEWSCRIPTDIALOG_H #include <QDialog> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> namespace Ui { class CreateNewScriptDialog; diff --git a/ccs/snapshot/NodeInSnapshotTableModel.h b/ccs/snapshot/NodeInSnapshotTableModel.h index e5861481b..82de76396 100644 --- a/ccs/snapshot/NodeInSnapshotTableModel.h +++ b/ccs/snapshot/NodeInSnapshotTableModel.h @@ -2,7 +2,7 @@ #define NODEINSNAPSHOTTABLEMODEL_H #include "../data/ChaosAbstractListModel.h" -#include <ChaosMetadataServiceClient/api_proxy/api.h> +#include <chaos_metadata_service_client/api_proxy/api.h> #include <QSharedPointer> diff --git a/ccs/snapshot/SnapshotTableModel.h b/ccs/snapshot/SnapshotTableModel.h index d9d7165fb..c39044e42 100644 --- a/ccs/snapshot/SnapshotTableModel.h +++ b/ccs/snapshot/SnapshotTableModel.h @@ -2,7 +2,7 @@ #define SNAPSHOTTABLEMODEL_H #include "../data/ChaosAbstractTableModel.h" -#include <ChaosMetadataServiceClient/api_proxy/api.h> +#include <chaos_metadata_service_client/api_proxy/api.h> #include <QSharedPointer> diff --git a/ccs/tree_group/DomainListModel.h b/ccs/tree_group/DomainListModel.h index f2f0441db..4b72ba1fa 100644 --- a/ccs/tree_group/DomainListModel.h +++ b/ccs/tree_group/DomainListModel.h @@ -5,7 +5,7 @@ #include "../api_async_processor/ApiSubmitter.h" #include <QVector> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> class DomainListModel : public ChaosAbstractListModel, diff --git a/ccs/tree_group/GroupTreeItem.cpp b/ccs/tree_group/GroupTreeItem.cpp index 70bf4549b..65f1fcef3 100644 --- a/ccs/tree_group/GroupTreeItem.cpp +++ b/ccs/tree_group/GroupTreeItem.cpp @@ -2,7 +2,7 @@ #include <QVector> #include <QSharedPointer> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> using namespace chaos::metadata_service_client; using namespace chaos::metadata_service_client::api_proxy; diff --git a/ccs/tree_group/GroupTreeModel.cpp b/ccs/tree_group/GroupTreeModel.cpp index f687129a9..ac9567aab 100644 --- a/ccs/tree_group/GroupTreeModel.cpp +++ b/ccs/tree_group/GroupTreeModel.cpp @@ -1,6 +1,6 @@ #include "GroupTreeModel.h" -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> #include <QUuid> #include <QDebug> diff --git a/ccs/widget/ChaosLabel.h b/ccs/widget/ChaosLabel.h index a7d0d5523..ef84a496a 100644 --- a/ccs/widget/ChaosLabel.h +++ b/ccs/widget/ChaosLabel.h @@ -5,7 +5,7 @@ #include <QLabel> #include <chaos/common/chaos_constants.h> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> typedef chaos::DataType::DataType ChaosDataType; diff --git a/chaos/common/io/IODataDriver.h b/chaos/common/io/IODataDriver.h index 42b82033e..26b04b59d 100644 --- a/chaos/common/io/IODataDriver.h +++ b/chaos/common/io/IODataDriver.h @@ -141,7 +141,7 @@ namespace chaos{ virtual void releaseQuery(QueryCursor *query) = 0; }; - typedef ChaosSharedPtr<chaos::common::io::IODataDriver> ioDataDriver_shr; + typedef ChaosSharedPtr<chaos::common::io::IODataDriver> IODataDriverShrdPtr; } diff --git a/ChaosMetadataServiceClient/CMakeLists.txt b/chaos_metadata_service_client/CMakeLists.txt similarity index 86% rename from ChaosMetadataServiceClient/CMakeLists.txt rename to chaos_metadata_service_client/CMakeLists.txt index 7a884eff4..98ff72cc2 100644 --- a/ChaosMetadataServiceClient/CMakeLists.txt +++ b/chaos_metadata_service_client/CMakeLists.txt @@ -146,44 +146,44 @@ INSTALL(FILES ${files} DESTINATION include/chaos_service_common/data/general) #install lib header FILE(GLOB files "*.h") -INSTALL(FILES ${files} DESTINATION include/ChaosMetadataServiceClient) +INSTALL(FILES ${files} DESTINATION include/chaos_metadata_service_client) FILE(GLOB files "api_proxy/*.h") -INSTALL(FILES ${files} DESTINATION include/ChaosMetadataServiceClient/api_proxy) +INSTALL(FILES ${files} DESTINATION include/chaos_metadata_service_client/api_proxy) FILE(GLOB files "api_proxy/logging/*.h") -INSTALL(FILES ${files} DESTINATION include/ChaosMetadataServiceClient/api_proxy/logging) +INSTALL(FILES ${files} DESTINATION include/chaos_metadata_service_client/api_proxy/logging) FILE(GLOB files "api_proxy/control_unit/*.h") -INSTALL(FILES ${files} DESTINATION include/ChaosMetadataServiceClient/api_proxy/control_unit) +INSTALL(FILES ${files} DESTINATION include/chaos_metadata_service_client/api_proxy/control_unit) FILE(GLOB files "api_proxy/unit_server/*.h") -INSTALL(FILES ${files} DESTINATION include/ChaosMetadataServiceClient/api_proxy/unit_server) +INSTALL(FILES ${files} DESTINATION include/chaos_metadata_service_client/api_proxy/unit_server) FILE(GLOB files "api_proxy/data_service/*.h") -INSTALL(FILES ${files} DESTINATION include/ChaosMetadataServiceClient/api_proxy/data_service) +INSTALL(FILES ${files} DESTINATION include/chaos_metadata_service_client/api_proxy/data_service) FILE(GLOB files "api_proxy/node/*.h") -INSTALL(FILES ${files} DESTINATION include/ChaosMetadataServiceClient/api_proxy/node) +INSTALL(FILES ${files} DESTINATION include/chaos_metadata_service_client/api_proxy/node) FILE(GLOB files "api_proxy/service/*.h") -INSTALL(FILES ${files} DESTINATION include/ChaosMetadataServiceClient/api_proxy/service) +INSTALL(FILES ${files} DESTINATION include/chaos_metadata_service_client/api_proxy/service) FILE(GLOB files "api_proxy/groups/*.h") -INSTALL(FILES ${files} DESTINATION include/ChaosMetadataServiceClient/api_proxy/groups) +INSTALL(FILES ${files} DESTINATION include/chaos_metadata_service_client/api_proxy/groups) FILE(GLOB files "api_proxy/script/*.h") -INSTALL(FILES ${files} DESTINATION include/ChaosMetadataServiceClient/api_proxy/script) +INSTALL(FILES ${files} DESTINATION include/chaos_metadata_service_client/api_proxy/script) FILE(GLOB files "monitor_system/*.h") -INSTALL(FILES ${files} DESTINATION include/ChaosMetadataServiceClient/monitor_system) +INSTALL(FILES ${files} DESTINATION include/chaos_metadata_service_client/monitor_system) FILE(GLOB files "monitor_system/handler/*.h") -INSTALL(FILES ${files} DESTINATION include/ChaosMetadataServiceClient/monitor_system/handler) +INSTALL(FILES ${files} DESTINATION include/chaos_metadata_service_client/monitor_system/handler) FILE(GLOB files "node_controller/*.h") -INSTALL(FILES ${files} DESTINATION include/ChaosMetadataServiceClient/node_controller/) +INSTALL(FILES ${files} DESTINATION include/chaos_metadata_service_client/node_controller/) FILE(GLOB files "event/*.h") -INSTALL(FILES ${files} DESTINATION include/ChaosMetadataServiceClient/event/) +INSTALL(FILES ${files} DESTINATION include/chaos_metadata_service_client/event/) INSTALL(TARGETS chaos_metadata_service_client DESTINATION "lib" diff --git a/ChaosMetadataServiceClient/ChaosMetadataServiceClient.cpp b/chaos_metadata_service_client/ChaosMetadataServiceClient.cpp similarity index 97% rename from ChaosMetadataServiceClient/ChaosMetadataServiceClient.cpp rename to chaos_metadata_service_client/ChaosMetadataServiceClient.cpp index 7499e5dbb..12e7f0282 100644 --- a/ChaosMetadataServiceClient/ChaosMetadataServiceClient.cpp +++ b/chaos_metadata_service_client/ChaosMetadataServiceClient.cpp @@ -19,13 +19,13 @@ * permissions and limitations under the Licence. */ +#include <chaos/common/chaos_constants.h> #include <chaos/common/network/NetworkBroker.h> +#include <chaos/common/utility/ObjectFactoryRegister.h> #include <chaos/common/configuration/GlobalConfiguration.h> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> -#include <ChaosMetadataServiceClient/metadata_service_client_constants.h> - -#include <chaos/common/utility/ObjectFactoryRegister.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/metadata_service_client_constants.h> #include <boost/format.hpp> #include <boost/algorithm/string.hpp> @@ -39,7 +39,7 @@ using namespace chaos::common::event; using namespace chaos::common::network; using namespace chaos::common::utility; using namespace chaos::metadata_service_client; -using namespace chaos::DataServiceNodeDefinitionKey; +using namespace chaos::metadata_service_client::node_monitor; using namespace chaos::metadata_service_client::event; using namespace chaos::metadata_service_client::api_proxy; using namespace chaos::metadata_service_client::monitor_system; @@ -99,8 +99,7 @@ void ChaosMetadataServiceClient::init() throw(CException) { //--------------node monitor--------------------- node_monitor.reset(new node_monitor::NodeMonitor(monitor_manager.get(), - api_proxy_manager.get(), - &setting), + api_proxy_manager.get()), "NodeMonitor"); node_monitor.init(NULL, __PRETTY_FUNCTION__); @@ -209,9 +208,9 @@ void ChaosMetadataServiceClient::disableMonitor() throw(CException) { } -chaos::common::io::ioDataDriver_shr ChaosMetadataServiceClient::getDataProxyChannelNewInstance() throw(CException){ +chaos::common::io::IODataDriverShrdPtr ChaosMetadataServiceClient::getDataProxyChannelNewInstance() throw(CException){ int poolsize=DPCK_LAST_DATASET_INDEX+1; - chaos::common::io::ioDataDriver_shr shret; + chaos::common::io::IODataDriverShrdPtr shret; if(GlobalConfiguration::getInstance()->hasOption(POOL_SIZE_OPTION)){ poolsize=GlobalConfiguration::getInstance()->getOption<int>(POOL_SIZE_OPTION); } @@ -281,7 +280,7 @@ void ChaosMetadataServiceClient::reconfigureMonitor() throw(CException) { //get the endpoint array CMSC_LDBG<< "Scan the result for serverlist"; - ChaosUniquePtr<CMultiTypeDataArrayWrapper> endpoint_array(available_enpoint_result->getResult()->getVectorValue(DS_DIRECT_IO_FULL_ADDRESS_LIST)); + ChaosUniquePtr<CMultiTypeDataArrayWrapper> endpoint_array(available_enpoint_result->getResult()->getVectorValue(chaos::DataServiceNodeDefinitionKey::DS_DIRECT_IO_FULL_ADDRESS_LIST)); CHAOS_LASSERT_EXCEPTION((endpoint_array->size()!=0), CMSC_LERR, -3, diff --git a/ChaosMetadataServiceClient/ChaosMetadataServiceClient.h b/chaos_metadata_service_client/ChaosMetadataServiceClient.h similarity index 92% rename from ChaosMetadataServiceClient/ChaosMetadataServiceClient.h rename to chaos_metadata_service_client/ChaosMetadataServiceClient.h index 06fa962b8..4997e09e9 100644 --- a/ChaosMetadataServiceClient/ChaosMetadataServiceClient.h +++ b/chaos_metadata_service_client/ChaosMetadataServiceClient.h @@ -21,20 +21,21 @@ #ifndef __CHAOSFramework__MetadataServiceClient__ #define __CHAOSFramework__MetadataServiceClient__ -#include <ChaosMetadataServiceClient/node_controller/CUController.h> -#include <ChaosMetadataServiceClient/event/event.h> -#include <ChaosMetadataServiceClient/api_proxy/api.h> -#include <ChaosMetadataServiceClient/metadata_service_client_types.h> -#include <ChaosMetadataServiceClient/monitor_system/monitor_system.h> +//#include <chaos_metadata_service_client/node_controller/CUController.h> +#include <chaos_metadata_service_client/event/event.h> +#include <chaos_metadata_service_client/api_proxy/api.h> +#include <chaos_metadata_service_client/metadata_service_client_types.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system.h> +#include <chaos_metadata_service_client/node_monitor/node_monitor.h> +#include <chaos_metadata_service_client/node_controller/CUController.h> -#include <ChaosMetadataServiceClient/node_monitor/node_monitor.h> #include <boost/thread/condition.hpp> #include <chaos/common/global.h> #include <chaos/common/ChaosCommon.h> #include <chaos/common/network/NetworkBroker.h> #include <chaos/common/thread/WaitSemaphore.h> #include <chaos/common/utility/StartableService.h> - +#include <chaos/common/io/IODataDriver.h> namespace chaos { namespace metadata_service_client { @@ -44,7 +45,7 @@ namespace chaos { /*! Singleton class that act as main entry for mds client library */ - class ChaosMetadataServiceClient : + class ChaosMetadataServiceClient: public ChaosCommon<ChaosMetadataServiceClient>, public ServerDelegator{ friend class common::utility::Singleton<ChaosMetadataServiceClient>; @@ -66,7 +67,7 @@ namespace chaos { //! default destructor ~ChaosMetadataServiceClient(); bool mds_client_initialized,mds_client_deinitialized; - std::vector<chaos::common::io::ioDataDriver_shr> iopool; + std::vector<chaos::common::io::IODataDriverShrdPtr> iopool; int io_pool_req; public: @@ -130,7 +131,7 @@ namespace chaos { //! add a new handler for a single attribute for a key bool addKeyAttributeHandler(const std::string& key_to_monitor, int quantum_multiplier, - monitor_system::AbstractQuantumKeyAttributeHandler *attribute_handler, + chaos::metadata_service_client::monitor_system::AbstractQuantumKeyAttributeHandler *attribute_handler, unsigned int consumer_priority = 500); //! add a new handler for a single attribute for a healt data for a key @@ -222,7 +223,7 @@ namespace chaos { void deleteCUController(chaos::metadata_service_client::node_controller::CUController *cu_ctrl_ptr); - chaos::common::io::ioDataDriver_shr getDataProxyChannelNewInstance() throw(CException); + chaos::common::io::IODataDriverShrdPtr getDataProxyChannelNewInstance() throw(CException); }; } diff --git a/ChaosMetadataServiceClient/api_proxy/ApiProxy.cpp b/chaos_metadata_service_client/api_proxy/ApiProxy.cpp similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/ApiProxy.cpp rename to chaos_metadata_service_client/api_proxy/ApiProxy.cpp index a02a5366d..8bb2f48be 100644 --- a/ChaosMetadataServiceClient/api_proxy/ApiProxy.cpp +++ b/chaos_metadata_service_client/api_proxy/ApiProxy.cpp @@ -18,7 +18,7 @@ * See the Licence for the specific language governing * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> using namespace chaos::metadata_service_client::api_proxy; diff --git a/ChaosMetadataServiceClient/api_proxy/ApiProxy.h b/chaos_metadata_service_client/api_proxy/ApiProxy.h similarity index 98% rename from ChaosMetadataServiceClient/api_proxy/ApiProxy.h rename to chaos_metadata_service_client/api_proxy/ApiProxy.h index 7e884b9ae..e2c8af5e8 100644 --- a/ChaosMetadataServiceClient/api_proxy/ApiProxy.h +++ b/chaos_metadata_service_client/api_proxy/ApiProxy.h @@ -25,7 +25,7 @@ #include <chaos/common/chaos_types.h> #include <chaos/common/message/MultiAddressMessageChannel.h> -#include <ChaosMetadataServiceClient/api_proxy/api_types.h> +#include <chaos_metadata_service_client/api_proxy/api_types.h> #include <boost/atomic.hpp> diff --git a/ChaosMetadataServiceClient/api_proxy/ApiProxyManager.cpp b/chaos_metadata_service_client/api_proxy/ApiProxyManager.cpp similarity index 83% rename from ChaosMetadataServiceClient/api_proxy/ApiProxyManager.cpp rename to chaos_metadata_service_client/api_proxy/ApiProxyManager.cpp index 3ba9edc1d..9325943a2 100644 --- a/ChaosMetadataServiceClient/api_proxy/ApiProxyManager.cpp +++ b/chaos_metadata_service_client/api_proxy/ApiProxyManager.cpp @@ -18,15 +18,16 @@ * See the Licence for the specific language governing * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxyManager.h> -#include <ChaosMetadataServiceClient/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxyManager.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> #include <chaos/common/network/NetworkBroker.h> -#define APM_LAPP INFO_LOG(ChaosMetadataServiceClient) -#define APM_LDBG DBG_LOG(ChaosMetadataServiceClient) -#define APM_LERR ERR_LOG(ChaosMetadataServiceClient) +#define APM_LAPP INFO_LOG(chaos_metadata_service_client) +#define APM_LDBG DBG_LOG(chaos_metadata_service_client) +#define APM_LERR ERR_LOG(chaos_metadata_service_client) using namespace chaos::common::network; +using namespace chaos::metadata_service_client; using namespace chaos::metadata_service_client::api_proxy; ApiProxyManager::ApiProxyManager(): @@ -38,7 +39,6 @@ void ApiProxyManager::init(void *init_data) throw (chaos::CException) { APM_LAPP << "Get multi address message channel"; mn_message_channel = NetworkBroker::getInstance()->getRawMultiAddressMessageChannel(); if(!mn_message_channel) throw chaos::CException(-1, "Error multinode message channel creation", __PRETTY_FUNCTION__); - //if(setting->mds_backend_servers.size() == 0) throw chaos::CException(-2, "No metadata server endpoint has been set", __PRETTY_FUNCTION__); for(BackendServerListIterator it = ChaosMetadataServiceClient::getInstance()->setting.mds_backend_servers.begin(); it != ChaosMetadataServiceClient::getInstance()->setting.mds_backend_servers.end(); diff --git a/ChaosMetadataServiceClient/api_proxy/ApiProxyManager.h b/chaos_metadata_service_client/api_proxy/ApiProxyManager.h similarity index 91% rename from ChaosMetadataServiceClient/api_proxy/ApiProxyManager.h rename to chaos_metadata_service_client/api_proxy/ApiProxyManager.h index 89bdd7a55..f6b118311 100644 --- a/ChaosMetadataServiceClient/api_proxy/ApiProxyManager.h +++ b/chaos_metadata_service_client/api_proxy/ApiProxyManager.h @@ -21,8 +21,8 @@ #ifndef __CHAOSFramework__ApiProxyManager__ #define __CHAOSFramework__ApiProxyManager__ -#include <ChaosMetadataServiceClient/metadata_service_client_types.h> -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +//#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/network/NetworkBroker.h> #include <chaos/common/utility/LockableObject.h> @@ -59,10 +59,10 @@ namespace chaos { chaos::common::message::MultiAddressMessageChannel *mn_message_channel; - //! default private constructor called only by ChaosMetadataServiceClient class + //! default private constructor called only by chaos_metadata_service_client class ApiProxyManager(); - //! default destructor called only by ChaosMetadataServiceClient class + //! default destructor called only by chaos_metadata_service_client class ~ApiProxyManager(); public: template<typename P> diff --git a/ChaosMetadataServiceClient/api_proxy/agent/CheckAgentHostedProcess.cpp b/chaos_metadata_service_client/api_proxy/agent/CheckAgentHostedProcess.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/agent/CheckAgentHostedProcess.cpp rename to chaos_metadata_service_client/api_proxy/agent/CheckAgentHostedProcess.cpp index ba2a4041b..31bc33852 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/CheckAgentHostedProcess.cpp +++ b/chaos_metadata_service_client/api_proxy/agent/CheckAgentHostedProcess.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/agent/CheckAgentHostedProcess.h> +#include <chaos_metadata_service_client/api_proxy/agent/CheckAgentHostedProcess.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/agent/CheckAgentHostedProcess.h b/chaos_metadata_service_client/api_proxy/agent/CheckAgentHostedProcess.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/agent/CheckAgentHostedProcess.h rename to chaos_metadata_service_client/api_proxy/agent/CheckAgentHostedProcess.h index 9bb42fed2..4699c1d6d 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/CheckAgentHostedProcess.h +++ b/chaos_metadata_service_client/api_proxy/agent/CheckAgentHostedProcess.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework_B9D7FBA3_13EC_485E_AC0A_2C87D20EC897_CheckAgentHostedProcess_h #define __CHAOSFramework_B9D7FBA3_13EC_485E_AC0A_2C87D20EC897_CheckAgentHostedProcess_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/agent/GetManagementConfiguration.cpp b/chaos_metadata_service_client/api_proxy/agent/GetManagementConfiguration.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/agent/GetManagementConfiguration.cpp rename to chaos_metadata_service_client/api_proxy/agent/GetManagementConfiguration.cpp index c96733220..71325bb7b 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/GetManagementConfiguration.cpp +++ b/chaos_metadata_service_client/api_proxy/agent/GetManagementConfiguration.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/agent/GetManagementConfiguration.h> +#include <chaos_metadata_service_client/api_proxy/agent/GetManagementConfiguration.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/agent/GetManagementConfiguration.h b/chaos_metadata_service_client/api_proxy/agent/GetManagementConfiguration.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/agent/GetManagementConfiguration.h rename to chaos_metadata_service_client/api_proxy/agent/GetManagementConfiguration.h index 5290cecb9..04b4df48e 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/GetManagementConfiguration.h +++ b/chaos_metadata_service_client/api_proxy/agent/GetManagementConfiguration.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__4990BF5_1D2A_4E32_96D1_D01CD1B6A6D9_GetManagementConfiguration_h #define __CHAOSFramework__4990BF5_1D2A_4E32_96D1_D01CD1B6A6D9_GetManagementConfiguration_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/agent/ListNodeForAgent.cpp b/chaos_metadata_service_client/api_proxy/agent/ListNodeForAgent.cpp similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/agent/ListNodeForAgent.cpp rename to chaos_metadata_service_client/api_proxy/agent/ListNodeForAgent.cpp index 80413eb3b..ec6ee544b 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/ListNodeForAgent.cpp +++ b/chaos_metadata_service_client/api_proxy/agent/ListNodeForAgent.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/agent/ListNodeForAgent.h> +#include <chaos_metadata_service_client/api_proxy/agent/ListNodeForAgent.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/agent/ListNodeForAgent.h b/chaos_metadata_service_client/api_proxy/agent/ListNodeForAgent.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/agent/ListNodeForAgent.h rename to chaos_metadata_service_client/api_proxy/agent/ListNodeForAgent.h index 920e9544a..3ef5cd0b8 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/ListNodeForAgent.h +++ b/chaos_metadata_service_client/api_proxy/agent/ListNodeForAgent.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__0BBEA50_92B1_4D03_88AF_F5FD9AEE27FA_ListNodeForAgent_h #define __CHAOSFramework__0BBEA50_92B1_4D03_88AF_F5FD9AEE27FA_ListNodeForAgent_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/agent/LoadAgentDescription.cpp b/chaos_metadata_service_client/api_proxy/agent/LoadAgentDescription.cpp similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/agent/LoadAgentDescription.cpp rename to chaos_metadata_service_client/api_proxy/agent/LoadAgentDescription.cpp index 73208c639..efd6d17b3 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/LoadAgentDescription.cpp +++ b/chaos_metadata_service_client/api_proxy/agent/LoadAgentDescription.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/agent/LoadAgentDescription.h> +#include <chaos_metadata_service_client/api_proxy/agent/LoadAgentDescription.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/agent/LoadAgentDescription.h b/chaos_metadata_service_client/api_proxy/agent/LoadAgentDescription.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/agent/LoadAgentDescription.h rename to chaos_metadata_service_client/api_proxy/agent/LoadAgentDescription.h index 03198e112..46a5f6e37 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/LoadAgentDescription.h +++ b/chaos_metadata_service_client/api_proxy/agent/LoadAgentDescription.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework_C694B943_5C76_4F78_A505_E57E6EACD39D_LoadAgentDescription_h #define __CHAOSFramework_C694B943_5C76_4F78_A505_E57E6EACD39D_LoadAgentDescription_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/agent/LoadNodeAssociation.cpp b/chaos_metadata_service_client/api_proxy/agent/LoadNodeAssociation.cpp similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/agent/LoadNodeAssociation.cpp rename to chaos_metadata_service_client/api_proxy/agent/LoadNodeAssociation.cpp index 6d85ef913..9146842d1 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/LoadNodeAssociation.cpp +++ b/chaos_metadata_service_client/api_proxy/agent/LoadNodeAssociation.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/agent/LoadNodeAssociation.h> +#include <chaos_metadata_service_client/api_proxy/agent/LoadNodeAssociation.h> #include <chaos/common/data/structured/Lists.h> diff --git a/ChaosMetadataServiceClient/api_proxy/agent/LoadNodeAssociation.h b/chaos_metadata_service_client/api_proxy/agent/LoadNodeAssociation.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/agent/LoadNodeAssociation.h rename to chaos_metadata_service_client/api_proxy/agent/LoadNodeAssociation.h index ca4923607..bd4382e06 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/LoadNodeAssociation.h +++ b/chaos_metadata_service_client/api_proxy/agent/LoadNodeAssociation.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__3A7F499_C69A_46A0_873E_D4C8CAA5E1C5_LoadNodeAssociation_h #define __CHAOSFramework__3A7F499_C69A_46A0_873E_D4C8CAA5E1C5_LoadNodeAssociation_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/agent/NodeOperation.cpp b/chaos_metadata_service_client/api_proxy/agent/NodeOperation.cpp similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/agent/NodeOperation.cpp rename to chaos_metadata_service_client/api_proxy/agent/NodeOperation.cpp index 3741e29cc..5af22a9cf 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/NodeOperation.cpp +++ b/chaos_metadata_service_client/api_proxy/agent/NodeOperation.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/agent/NodeOperation.h> +#include <chaos_metadata_service_client/api_proxy/agent/NodeOperation.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/agent/NodeOperation.h b/chaos_metadata_service_client/api_proxy/agent/NodeOperation.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/agent/NodeOperation.h rename to chaos_metadata_service_client/api_proxy/agent/NodeOperation.h index 3d308e873..cda16a87a 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/NodeOperation.h +++ b/chaos_metadata_service_client/api_proxy/agent/NodeOperation.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework_B4233352_30A8_42F0_84AE_39941D11E93D_NodeOperation_h #define __CHAOSFramework_B4233352_30A8_42F0_84AE_39941D11E93D_NodeOperation_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/agent/RemoveNodeAssociation.cpp b/chaos_metadata_service_client/api_proxy/agent/RemoveNodeAssociation.cpp similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/agent/RemoveNodeAssociation.cpp rename to chaos_metadata_service_client/api_proxy/agent/RemoveNodeAssociation.cpp index 61dce68d0..470be8b4a 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/RemoveNodeAssociation.cpp +++ b/chaos_metadata_service_client/api_proxy/agent/RemoveNodeAssociation.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/agent/RemoveNodeAssociation.h> +#include <chaos_metadata_service_client/api_proxy/agent/RemoveNodeAssociation.h> #include <chaos/common/data/structured/Lists.h> diff --git a/ChaosMetadataServiceClient/api_proxy/agent/RemoveNodeAssociation.h b/chaos_metadata_service_client/api_proxy/agent/RemoveNodeAssociation.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/agent/RemoveNodeAssociation.h rename to chaos_metadata_service_client/api_proxy/agent/RemoveNodeAssociation.h index e8a6a2ec1..c49bec0f1 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/RemoveNodeAssociation.h +++ b/chaos_metadata_service_client/api_proxy/agent/RemoveNodeAssociation.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__4AF933B_8306_4117_8A6E_1835E700C1E5_RemoveNodeAssociation_h #define __CHAOSFramework__4AF933B_8306_4117_8A6E_1835E700C1E5_RemoveNodeAssociation_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/agent/SaveNodeAssociation.cpp b/chaos_metadata_service_client/api_proxy/agent/SaveNodeAssociation.cpp similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/agent/SaveNodeAssociation.cpp rename to chaos_metadata_service_client/api_proxy/agent/SaveNodeAssociation.cpp index c206ed078..57270b35e 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/SaveNodeAssociation.cpp +++ b/chaos_metadata_service_client/api_proxy/agent/SaveNodeAssociation.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/agent/SaveNodeAssociation.h> +#include <chaos_metadata_service_client/api_proxy/agent/SaveNodeAssociation.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/agent/SaveNodeAssociation.h b/chaos_metadata_service_client/api_proxy/agent/SaveNodeAssociation.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/agent/SaveNodeAssociation.h rename to chaos_metadata_service_client/api_proxy/agent/SaveNodeAssociation.h index 0d76d953b..ad7580970 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/SaveNodeAssociation.h +++ b/chaos_metadata_service_client/api_proxy/agent/SaveNodeAssociation.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework_B6736975_C5CA_45F4_A7AD_A9B95F8DCB32_SaveNodeAssociation_h #define __CHAOSFramework_B6736975_C5CA_45F4_A7AD_A9B95F8DCB32_SaveNodeAssociation_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/agent/SetManagementConfiguration.cpp b/chaos_metadata_service_client/api_proxy/agent/SetManagementConfiguration.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/agent/SetManagementConfiguration.cpp rename to chaos_metadata_service_client/api_proxy/agent/SetManagementConfiguration.cpp index ea4ca9ba0..72efec445 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/SetManagementConfiguration.cpp +++ b/chaos_metadata_service_client/api_proxy/agent/SetManagementConfiguration.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/agent/SetManagementConfiguration.h> +#include <chaos_metadata_service_client/api_proxy/agent/SetManagementConfiguration.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/agent/SetManagementConfiguration.h b/chaos_metadata_service_client/api_proxy/agent/SetManagementConfiguration.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/agent/SetManagementConfiguration.h rename to chaos_metadata_service_client/api_proxy/agent/SetManagementConfiguration.h index 31d1f111d..e705a3833 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/SetManagementConfiguration.h +++ b/chaos_metadata_service_client/api_proxy/agent/SetManagementConfiguration.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__AFFA027_1087_40A0_8EA4_95E22A477C86_SetManagementConfiguration_h #define __CHAOSFramework__AFFA027_1087_40A0_8EA4_95E22A477C86_SetManagementConfiguration_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/agent/agent.h b/chaos_metadata_service_client/api_proxy/agent/agent.h similarity index 50% rename from ChaosMetadataServiceClient/api_proxy/agent/agent.h rename to chaos_metadata_service_client/api_proxy/agent/agent.h index 5494fe794..0be28407e 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/agent.h +++ b/chaos_metadata_service_client/api_proxy/agent/agent.h @@ -22,16 +22,16 @@ #ifndef __CHAOSFramework__57311D4_B841_4942_AEA8_FD8FDA8D6594_agent_h #define __CHAOSFramework__57311D4_B841_4942_AEA8_FD8FDA8D6594_agent_h -#include <ChaosMetadataServiceClient/api_proxy/agent/NodeOperation.h> -#include <ChaosMetadataServiceClient/api_proxy/agent/ListNodeForAgent.h> -#include <ChaosMetadataServiceClient/api_proxy/agent/SaveNodeAssociation.h> -#include <ChaosMetadataServiceClient/api_proxy/agent/LoadNodeAssociation.h> -#include <ChaosMetadataServiceClient/api_proxy/agent/LoadAgentDescription.h> -#include <ChaosMetadataServiceClient/api_proxy/agent/RemoveNodeAssociation.h> -#include <ChaosMetadataServiceClient/api_proxy/agent/CheckAgentHostedProcess.h> -#include <ChaosMetadataServiceClient/api_proxy/agent/GetManagementConfiguration.h> -#include <ChaosMetadataServiceClient/api_proxy/agent/SetManagementConfiguration.h> +#include <chaos_metadata_service_client/api_proxy/agent/NodeOperation.h> +#include <chaos_metadata_service_client/api_proxy/agent/ListNodeForAgent.h> +#include <chaos_metadata_service_client/api_proxy/agent/SaveNodeAssociation.h> +#include <chaos_metadata_service_client/api_proxy/agent/LoadNodeAssociation.h> +#include <chaos_metadata_service_client/api_proxy/agent/LoadAgentDescription.h> +#include <chaos_metadata_service_client/api_proxy/agent/RemoveNodeAssociation.h> +#include <chaos_metadata_service_client/api_proxy/agent/CheckAgentHostedProcess.h> +#include <chaos_metadata_service_client/api_proxy/agent/GetManagementConfiguration.h> +#include <chaos_metadata_service_client/api_proxy/agent/SetManagementConfiguration.h> -#include <ChaosMetadataServiceClient/api_proxy/agent/logging/ManageNodeLogging.h> -#include <ChaosMetadataServiceClient/api_proxy/agent/logging/GetProcessLogEntries.h> +#include <chaos_metadata_service_client/api_proxy/agent/logging/ManageNodeLogging.h> +#include <chaos_metadata_service_client/api_proxy/agent/logging/GetProcessLogEntries.h> #endif /* __CHAOSFramework__57311D4_B841_4942_AEA8_FD8FDA8D6594_agent_h */ diff --git a/ChaosMetadataServiceClient/api_proxy/agent/logging/GetProcessLogEntries.cpp b/chaos_metadata_service_client/api_proxy/agent/logging/GetProcessLogEntries.cpp similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/agent/logging/GetProcessLogEntries.cpp rename to chaos_metadata_service_client/api_proxy/agent/logging/GetProcessLogEntries.cpp index 5d29ea67f..23c5565f4 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/logging/GetProcessLogEntries.cpp +++ b/chaos_metadata_service_client/api_proxy/agent/logging/GetProcessLogEntries.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/agent/logging/GetProcessLogEntries.h> +#include <chaos_metadata_service_client/api_proxy/agent/logging/GetProcessLogEntries.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/agent/logging/GetProcessLogEntries.h b/chaos_metadata_service_client/api_proxy/agent/logging/GetProcessLogEntries.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/agent/logging/GetProcessLogEntries.h rename to chaos_metadata_service_client/api_proxy/agent/logging/GetProcessLogEntries.h index 7942b8939..a7e017c42 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/logging/GetProcessLogEntries.h +++ b/chaos_metadata_service_client/api_proxy/agent/logging/GetProcessLogEntries.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__7A969D3_B3CE_4D31_B393_80AE958E2055_GetProcessLogEntries_h #define __CHAOSFramework__7A969D3_B3CE_4D31_B393_80AE958E2055_GetProcessLogEntries_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/agent/logging/ManageNodeLogging.cpp b/chaos_metadata_service_client/api_proxy/agent/logging/ManageNodeLogging.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/agent/logging/ManageNodeLogging.cpp rename to chaos_metadata_service_client/api_proxy/agent/logging/ManageNodeLogging.cpp index 973796924..b89bd3e0d 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/logging/ManageNodeLogging.cpp +++ b/chaos_metadata_service_client/api_proxy/agent/logging/ManageNodeLogging.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/agent/logging/ManageNodeLogging.h> +#include <chaos_metadata_service_client/api_proxy/agent/logging/ManageNodeLogging.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/agent/logging/ManageNodeLogging.h b/chaos_metadata_service_client/api_proxy/agent/logging/ManageNodeLogging.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/agent/logging/ManageNodeLogging.h rename to chaos_metadata_service_client/api_proxy/agent/logging/ManageNodeLogging.h index 1b4c770ed..edcf20877 100644 --- a/ChaosMetadataServiceClient/api_proxy/agent/logging/ManageNodeLogging.h +++ b/chaos_metadata_service_client/api_proxy/agent/logging/ManageNodeLogging.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__29AA7C7_A0C5_4E36_9587_E5B0491B8B56_ManageNodeLogging_h #define __CHAOSFramework__29AA7C7_A0C5_4E36_9587_E5B0491B8B56_ManageNodeLogging_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/api.h b/chaos_metadata_service_client/api_proxy/api.h similarity index 53% rename from ChaosMetadataServiceClient/api_proxy/api.h rename to chaos_metadata_service_client/api_proxy/api.h index df186267d..d2fcee6a1 100644 --- a/ChaosMetadataServiceClient/api_proxy/api.h +++ b/chaos_metadata_service_client/api_proxy/api.h @@ -21,19 +21,19 @@ #ifndef CHAOSFramework_api_proxy_h #define CHAOSFramework_api_proxy_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> -#include <ChaosMetadataServiceClient/api_proxy/ApiProxyManager.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxyManager.h> //---include all api header -#include <ChaosMetadataServiceClient/api_proxy/agent/agent.h> -#include <ChaosMetadataServiceClient/api_proxy/node/node.h> -#include <ChaosMetadataServiceClient/api_proxy/groups/groups.h> -#include <ChaosMetadataServiceClient/api_proxy/script/script.h> -#include <ChaosMetadataServiceClient/api_proxy/logging/logging.h> -#include <ChaosMetadataServiceClient/api_proxy/service/service.h> -#include <ChaosMetadataServiceClient/api_proxy/data_service/data_service.h> -#include <ChaosMetadataServiceClient/api_proxy/control_unit/control_unit.h> -#include <ChaosMetadataServiceClient/api_proxy/unit_server/unit_server.h> +#include <chaos_metadata_service_client/api_proxy/agent/agent.h> +#include <chaos_metadata_service_client/api_proxy/node/node.h> +#include <chaos_metadata_service_client/api_proxy/groups/groups.h> +#include <chaos_metadata_service_client/api_proxy/script/script.h> +#include <chaos_metadata_service_client/api_proxy/logging/logging.h> +#include <chaos_metadata_service_client/api_proxy/service/service.h> +#include <chaos_metadata_service_client/api_proxy/data_service/data_service.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/control_unit.h> +#include <chaos_metadata_service_client/api_proxy/unit_server/unit_server.h> //add all service common data #include <chaos_service_common/data/data.h> diff --git a/ChaosMetadataServiceClient/api_proxy/api_types.h b/chaos_metadata_service_client/api_proxy/api_types.h similarity index 100% rename from ChaosMetadataServiceClient/api_proxy/api_types.h rename to chaos_metadata_service_client/api_proxy/api_types.h diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/CopyInstance.cpp b/chaos_metadata_service_client/api_proxy/control_unit/CopyInstance.cpp similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/control_unit/CopyInstance.cpp rename to chaos_metadata_service_client/api_proxy/control_unit/CopyInstance.cpp index c1beae4b1..d06fc6073 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/CopyInstance.cpp +++ b/chaos_metadata_service_client/api_proxy/control_unit/CopyInstance.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/control_unit/CopyInstance.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/CopyInstance.h> using namespace chaos::common::data; using namespace chaos::metadata_service_client::api_proxy; diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/CopyInstance.h b/chaos_metadata_service_client/api_proxy/control_unit/CopyInstance.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/control_unit/CopyInstance.h rename to chaos_metadata_service_client/api_proxy/control_unit/CopyInstance.h index c60675945..e6c3c616d 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/CopyInstance.h +++ b/chaos_metadata_service_client/api_proxy/control_unit/CopyInstance.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__CopyInstance_h #define __CHAOSFramework__CopyInstance_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <boost/shared_ptr.hpp> diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/Delete.cpp b/chaos_metadata_service_client/api_proxy/control_unit/Delete.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/control_unit/Delete.cpp rename to chaos_metadata_service_client/api_proxy/control_unit/Delete.cpp index 1d6918a35..06b96bf42 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/Delete.cpp +++ b/chaos_metadata_service_client/api_proxy/control_unit/Delete.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/control_unit/Delete.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/Delete.h> using namespace chaos::common::data; using namespace chaos::metadata_service_client::api_proxy; diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/Delete.h b/chaos_metadata_service_client/api_proxy/control_unit/Delete.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/control_unit/Delete.h rename to chaos_metadata_service_client/api_proxy/control_unit/Delete.h index a0f128b36..50fcb585b 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/Delete.h +++ b/chaos_metadata_service_client/api_proxy/control_unit/Delete.h @@ -23,7 +23,7 @@ #define __CHAOSFramework__Delete_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <boost/shared_ptr.hpp> diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/DeleteInstance.cpp b/chaos_metadata_service_client/api_proxy/control_unit/DeleteInstance.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/control_unit/DeleteInstance.cpp rename to chaos_metadata_service_client/api_proxy/control_unit/DeleteInstance.cpp index e18b673d4..b26b69114 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/DeleteInstance.cpp +++ b/chaos_metadata_service_client/api_proxy/control_unit/DeleteInstance.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/control_unit/DeleteInstance.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/DeleteInstance.h> using namespace chaos::metadata_service_client::api_proxy; @@ -38,4 +38,4 @@ ApiProxyResult DeleteInstance::execute(const std::string& unit_server_uid, message->addStringValue(chaos::NodeDefinitionKey::NODE_UNIQUE_ID, control_unit_uid); message->addStringValue(chaos::NodeDefinitionKey::NODE_PARENT, unit_server_uid); return callApi(message); -} \ No newline at end of file +} diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/DeleteInstance.h b/chaos_metadata_service_client/api_proxy/control_unit/DeleteInstance.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/control_unit/DeleteInstance.h rename to chaos_metadata_service_client/api_proxy/control_unit/DeleteInstance.h index 2d971ac4c..00ce9be82 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/DeleteInstance.h +++ b/chaos_metadata_service_client/api_proxy/control_unit/DeleteInstance.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__DeleteInstance__ #define __CHAOSFramework__DeleteInstance__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/GetCurrentDataset.cpp b/chaos_metadata_service_client/api_proxy/control_unit/GetCurrentDataset.cpp similarity index 93% rename from ChaosMetadataServiceClient/api_proxy/control_unit/GetCurrentDataset.cpp rename to chaos_metadata_service_client/api_proxy/control_unit/GetCurrentDataset.cpp index 262ed8352..21d6fd1a5 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/GetCurrentDataset.cpp +++ b/chaos_metadata_service_client/api_proxy/control_unit/GetCurrentDataset.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/control_unit/GetCurrentDataset.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/GetCurrentDataset.h> using namespace chaos::metadata_service_client::api_proxy; using namespace chaos::metadata_service_client::api_proxy::control_unit; @@ -35,4 +35,4 @@ ApiProxyResult GetCurrentDataset::execute(const std::string& cu_unique_id) { chaos::common::data::CDataWrapper *message = new chaos::common::data::CDataWrapper(); message->addStringValue(chaos::NodeDefinitionKey::NODE_UNIQUE_ID, cu_unique_id); return callApi(message); -} \ No newline at end of file +} diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/GetCurrentDataset.h b/chaos_metadata_service_client/api_proxy/control_unit/GetCurrentDataset.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/control_unit/GetCurrentDataset.h rename to chaos_metadata_service_client/api_proxy/control_unit/GetCurrentDataset.h index a1235b3a2..5c245f06a 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/GetCurrentDataset.h +++ b/chaos_metadata_service_client/api_proxy/control_unit/GetCurrentDataset.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__GetCurrentDataset__ #define __CHAOSFramework__GetCurrentDataset__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/GetInstance.cpp b/chaos_metadata_service_client/api_proxy/control_unit/GetInstance.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/control_unit/GetInstance.cpp rename to chaos_metadata_service_client/api_proxy/control_unit/GetInstance.cpp index 4bc575e2d..d16cb5385 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/GetInstance.cpp +++ b/chaos_metadata_service_client/api_proxy/control_unit/GetInstance.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/control_unit/GetInstance.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/GetInstance.h> using namespace chaos::metadata_service_client::api_proxy; using namespace chaos::metadata_service_client::api_proxy::control_unit; @@ -36,4 +36,4 @@ ApiProxyResult GetInstance::execute(const std::string& control_unit_uid) { message->addStringValue(chaos::NodeDefinitionKey::NODE_UNIQUE_ID, control_unit_uid); //message->addStringValue(chaos::NodeDefinitionKey::NODE_PARENT, unit_server_uid); return callApi(message); -} \ No newline at end of file +} diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/GetInstance.h b/chaos_metadata_service_client/api_proxy/control_unit/GetInstance.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/control_unit/GetInstance.h rename to chaos_metadata_service_client/api_proxy/control_unit/GetInstance.h index db8601cd6..ff7347827 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/GetInstance.h +++ b/chaos_metadata_service_client/api_proxy/control_unit/GetInstance.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__GetInstance__ #define __CHAOSFramework__GetInstance__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/InitDeinit.cpp b/chaos_metadata_service_client/api_proxy/control_unit/InitDeinit.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/control_unit/InitDeinit.cpp rename to chaos_metadata_service_client/api_proxy/control_unit/InitDeinit.cpp index cb0669c8a..88b85d74d 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/InitDeinit.cpp +++ b/chaos_metadata_service_client/api_proxy/control_unit/InitDeinit.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/control_unit/InitDeinit.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/InitDeinit.h> using namespace chaos::metadata_service_client::api_proxy; using namespace chaos::metadata_service_client::api_proxy::control_unit; diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/InitDeinit.h b/chaos_metadata_service_client/api_proxy/control_unit/InitDeinit.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/control_unit/InitDeinit.h rename to chaos_metadata_service_client/api_proxy/control_unit/InitDeinit.h index a47a794f7..fc457c694 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/InitDeinit.h +++ b/chaos_metadata_service_client/api_proxy/control_unit/InitDeinit.h @@ -21,7 +21,7 @@ #ifndef __CHAOSFramework__InitDeinit__ #define __CHAOSFramework__InitDeinit__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/RecoverError.cpp b/chaos_metadata_service_client/api_proxy/control_unit/RecoverError.cpp similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/control_unit/RecoverError.cpp rename to chaos_metadata_service_client/api_proxy/control_unit/RecoverError.cpp index 9a2e37bcf..0e004592f 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/RecoverError.cpp +++ b/chaos_metadata_service_client/api_proxy/control_unit/RecoverError.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/control_unit/RecoverError.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/RecoverError.h> using namespace chaos::common::data; using namespace chaos::metadata_service_client::api_proxy; diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/RecoverError.h b/chaos_metadata_service_client/api_proxy/control_unit/RecoverError.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/control_unit/RecoverError.h rename to chaos_metadata_service_client/api_proxy/control_unit/RecoverError.h index e8af2dc4d..208917080 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/RecoverError.h +++ b/chaos_metadata_service_client/api_proxy/control_unit/RecoverError.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__RecoverError_h #define __CHAOSFramework__RecoverError_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <boost/shared_ptr.hpp> diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/SearchInstancesByUS.cpp b/chaos_metadata_service_client/api_proxy/control_unit/SearchInstancesByUS.cpp similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/control_unit/SearchInstancesByUS.cpp rename to chaos_metadata_service_client/api_proxy/control_unit/SearchInstancesByUS.cpp index c02281d3c..12496721f 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/SearchInstancesByUS.cpp +++ b/chaos_metadata_service_client/api_proxy/control_unit/SearchInstancesByUS.cpp @@ -18,7 +18,7 @@ * See the Licence for the specific language governing * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/control_unit/SearchInstancesByUS.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/SearchInstancesByUS.h> using namespace chaos::metadata_service_client::api_proxy; using namespace chaos::metadata_service_client::api_proxy::control_unit; @@ -47,4 +47,4 @@ ApiProxyResult SearchInstancesByUS::execute(std::string unit_server_uid, message->addInt32Value("last_node_sequence_id", last_node_sequence_id); message->addInt32Value("result_page_length", result_page_length); return callApi(message); -} \ No newline at end of file +} diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/SearchInstancesByUS.h b/chaos_metadata_service_client/api_proxy/control_unit/SearchInstancesByUS.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/control_unit/SearchInstancesByUS.h rename to chaos_metadata_service_client/api_proxy/control_unit/SearchInstancesByUS.h index 7f8d8701e..6af63160d 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/SearchInstancesByUS.h +++ b/chaos_metadata_service_client/api_proxy/control_unit/SearchInstancesByUS.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__SearchInstancesByUS__ #define __CHAOSFramework__SearchInstancesByUS__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/SetInputDatasetAttributeValues.cpp b/chaos_metadata_service_client/api_proxy/control_unit/SetInputDatasetAttributeValues.cpp similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/control_unit/SetInputDatasetAttributeValues.cpp rename to chaos_metadata_service_client/api_proxy/control_unit/SetInputDatasetAttributeValues.cpp index f9c808898..d145de855 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/SetInputDatasetAttributeValues.cpp +++ b/chaos_metadata_service_client/api_proxy/control_unit/SetInputDatasetAttributeValues.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/control_unit/SetInputDatasetAttributeValues.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/SetInputDatasetAttributeValues.h> using namespace chaos::common::data; using namespace chaos::metadata_service_client::api_proxy; diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/SetInputDatasetAttributeValues.h b/chaos_metadata_service_client/api_proxy/control_unit/SetInputDatasetAttributeValues.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/control_unit/SetInputDatasetAttributeValues.h rename to chaos_metadata_service_client/api_proxy/control_unit/SetInputDatasetAttributeValues.h index fa94b3fd5..d72fc99e7 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/SetInputDatasetAttributeValues.h +++ b/chaos_metadata_service_client/api_proxy/control_unit/SetInputDatasetAttributeValues.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__SetInputDatasetAttributeValues__ #define __CHAOSFramework__SetInputDatasetAttributeValues__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <boost/shared_ptr.hpp> namespace chaos { diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/SetInstanceDescription.cpp b/chaos_metadata_service_client/api_proxy/control_unit/SetInstanceDescription.cpp similarity index 98% rename from ChaosMetadataServiceClient/api_proxy/control_unit/SetInstanceDescription.cpp rename to chaos_metadata_service_client/api_proxy/control_unit/SetInstanceDescription.cpp index 49818855d..841f8eb21 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/SetInstanceDescription.cpp +++ b/chaos_metadata_service_client/api_proxy/control_unit/SetInstanceDescription.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/control_unit/SetInstanceDescription.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/SetInstanceDescription.h> using namespace chaos::common::data; using namespace chaos::metadata_service_client::api_proxy; diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/SetInstanceDescription.h b/chaos_metadata_service_client/api_proxy/control_unit/SetInstanceDescription.h similarity index 99% rename from ChaosMetadataServiceClient/api_proxy/control_unit/SetInstanceDescription.h rename to chaos_metadata_service_client/api_proxy/control_unit/SetInstanceDescription.h index 792a46d75..5a8c5da5a 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/SetInstanceDescription.h +++ b/chaos_metadata_service_client/api_proxy/control_unit/SetInstanceDescription.h @@ -21,7 +21,7 @@ #ifndef __CHAOSFramework__SetInstanceDescription__ #define __CHAOSFramework__SetInstanceDescription__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <boost/ptr_container/ptr_vector.hpp> diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/StartStop.cpp b/chaos_metadata_service_client/api_proxy/control_unit/StartStop.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/control_unit/StartStop.cpp rename to chaos_metadata_service_client/api_proxy/control_unit/StartStop.cpp index bb7793359..030471c57 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/StartStop.cpp +++ b/chaos_metadata_service_client/api_proxy/control_unit/StartStop.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/control_unit/StartStop.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/StartStop.h> using namespace chaos::metadata_service_client::api_proxy; using namespace chaos::metadata_service_client::api_proxy::control_unit; @@ -37,4 +37,4 @@ ApiProxyResult StartStop::execute(const std::string& cu_unique_id, message->addStringValue(chaos::NodeDefinitionKey::NODE_UNIQUE_ID, cu_unique_id); message->addBoolValue("start", start); return callApi(message); -} \ No newline at end of file +} diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/StartStop.h b/chaos_metadata_service_client/api_proxy/control_unit/StartStop.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/control_unit/StartStop.h rename to chaos_metadata_service_client/api_proxy/control_unit/StartStop.h index 9b5ad1661..f2906fd1b 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/StartStop.h +++ b/chaos_metadata_service_client/api_proxy/control_unit/StartStop.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__StartStop__ #define __CHAOSFramework__StartStop__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/control_unit/control_unit.h b/chaos_metadata_service_client/api_proxy/control_unit/control_unit.h similarity index 51% rename from ChaosMetadataServiceClient/api_proxy/control_unit/control_unit.h rename to chaos_metadata_service_client/api_proxy/control_unit/control_unit.h index 16f892685..ad0dbe952 100644 --- a/ChaosMetadataServiceClient/api_proxy/control_unit/control_unit.h +++ b/chaos_metadata_service_client/api_proxy/control_unit/control_unit.h @@ -22,16 +22,16 @@ #ifndef __CHAOSFramework__21F26AF_8477_485A_A08A_39F56D3644AE_control_unit_h #define __CHAOSFramework__21F26AF_8477_485A_A08A_39F56D3644AE_control_unit_h -#include <ChaosMetadataServiceClient/api_proxy/control_unit/Delete.h> -#include <ChaosMetadataServiceClient/api_proxy/control_unit/StartStop.h> -#include <ChaosMetadataServiceClient/api_proxy/control_unit/InitDeinit.h> -#include <ChaosMetadataServiceClient/api_proxy/control_unit/GetInstance.h> -#include <ChaosMetadataServiceClient/api_proxy/control_unit/CopyInstance.h> -#include <ChaosMetadataServiceClient/api_proxy/control_unit/RecoverError.h> -#include <ChaosMetadataServiceClient/api_proxy/control_unit/DeleteInstance.h> -#include <ChaosMetadataServiceClient/api_proxy/control_unit/GetCurrentDataset.h> -#include <ChaosMetadataServiceClient/api_proxy/control_unit/SearchInstancesByUS.h> -#include <ChaosMetadataServiceClient/api_proxy/control_unit/SetInstanceDescription.h> -#include <ChaosMetadataServiceClient/api_proxy/control_unit/SetInputDatasetAttributeValues.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/Delete.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/StartStop.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/InitDeinit.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/GetInstance.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/CopyInstance.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/RecoverError.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/DeleteInstance.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/GetCurrentDataset.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/SearchInstancesByUS.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/SetInstanceDescription.h> +#include <chaos_metadata_service_client/api_proxy/control_unit/SetInputDatasetAttributeValues.h> #endif /* __CHAOSFramework__21F26AF_8477_485A_A08A_39F56D3644AE_control_unit_h */ diff --git a/ChaosMetadataServiceClient/api_proxy/data_service/AssociationControlUnit.cpp b/chaos_metadata_service_client/api_proxy/data_service/AssociationControlUnit.cpp similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/data_service/AssociationControlUnit.cpp rename to chaos_metadata_service_client/api_proxy/data_service/AssociationControlUnit.cpp index 5eda479ac..c36f3fa77 100644 --- a/ChaosMetadataServiceClient/api_proxy/data_service/AssociationControlUnit.cpp +++ b/chaos_metadata_service_client/api_proxy/data_service/AssociationControlUnit.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/data_service/AssociationControlUnit.h> +#include <chaos_metadata_service_client/api_proxy/data_service/AssociationControlUnit.h> using namespace chaos; using namespace chaos::metadata_service_client::api_proxy; @@ -46,4 +46,4 @@ ApiProxyResult AssociationControlUnit::execute(const std::string& ds_unique_id, } message->finalizeArrayForKey(NodeDefinitionKey::NODE_UNIQUE_ID); return callApi(message); -} \ No newline at end of file +} diff --git a/ChaosMetadataServiceClient/api_proxy/data_service/AssociationControlUnit.h b/chaos_metadata_service_client/api_proxy/data_service/AssociationControlUnit.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/data_service/AssociationControlUnit.h rename to chaos_metadata_service_client/api_proxy/data_service/AssociationControlUnit.h index 24085e0ab..4c2e725a1 100644 --- a/ChaosMetadataServiceClient/api_proxy/data_service/AssociationControlUnit.h +++ b/chaos_metadata_service_client/api_proxy/data_service/AssociationControlUnit.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__AssociationControlUnitByDS__ #define __CHAOSFramework__AssociationControlUnitByDS__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <vector> #include <string> diff --git a/ChaosMetadataServiceClient/api_proxy/data_service/DeleteDS.cpp b/chaos_metadata_service_client/api_proxy/data_service/DeleteDS.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/data_service/DeleteDS.cpp rename to chaos_metadata_service_client/api_proxy/data_service/DeleteDS.cpp index af46edd72..f1cc3f108 100644 --- a/ChaosMetadataServiceClient/api_proxy/data_service/DeleteDS.cpp +++ b/chaos_metadata_service_client/api_proxy/data_service/DeleteDS.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/data_service/DeleteDS.h> +#include <chaos_metadata_service_client/api_proxy/data_service/DeleteDS.h> using namespace chaos; using namespace chaos::metadata_service_client::api_proxy; @@ -37,4 +37,4 @@ ApiProxyResult DeleteDS::execute(const std::string& ds_unique_id) { common::data::CDataWrapper *message = new common::data::CDataWrapper(); message->addStringValue(NodeDefinitionKey::NODE_UNIQUE_ID, ds_unique_id); return callApi(message); -} \ No newline at end of file +} diff --git a/ChaosMetadataServiceClient/api_proxy/data_service/DeleteDS.h b/chaos_metadata_service_client/api_proxy/data_service/DeleteDS.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/data_service/DeleteDS.h rename to chaos_metadata_service_client/api_proxy/data_service/DeleteDS.h index 738a254cd..e5dbb34d9 100644 --- a/ChaosMetadataServiceClient/api_proxy/data_service/DeleteDS.h +++ b/chaos_metadata_service_client/api_proxy/data_service/DeleteDS.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__DeleteDS__ #define __CHAOSFramework__DeleteDS__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/data_service/GetAllDS.cpp b/chaos_metadata_service_client/api_proxy/data_service/GetAllDS.cpp similarity index 93% rename from ChaosMetadataServiceClient/api_proxy/data_service/GetAllDS.cpp rename to chaos_metadata_service_client/api_proxy/data_service/GetAllDS.cpp index 8f2e8448f..788eb36b9 100644 --- a/ChaosMetadataServiceClient/api_proxy/data_service/GetAllDS.cpp +++ b/chaos_metadata_service_client/api_proxy/data_service/GetAllDS.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/data_service/GetAllDS.h> +#include <chaos_metadata_service_client/api_proxy/data_service/GetAllDS.h> using namespace chaos; using namespace chaos::metadata_service_client::api_proxy; @@ -34,4 +34,4 @@ API_PROXY_CD_DEFINITION(GetAllDS, */ ApiProxyResult GetAllDS::execute() { return callApi(NULL); -} \ No newline at end of file +} diff --git a/ChaosMetadataServiceClient/api_proxy/data_service/GetAllDS.h b/chaos_metadata_service_client/api_proxy/data_service/GetAllDS.h similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/data_service/GetAllDS.h rename to chaos_metadata_service_client/api_proxy/data_service/GetAllDS.h index 7b576895e..8382da21f 100644 --- a/ChaosMetadataServiceClient/api_proxy/data_service/GetAllDS.h +++ b/chaos_metadata_service_client/api_proxy/data_service/GetAllDS.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__GetAllDS__ #define __CHAOSFramework__GetAllDS__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/data_service/GetAssociationByDS.cpp b/chaos_metadata_service_client/api_proxy/data_service/GetAssociationByDS.cpp similarity index 93% rename from ChaosMetadataServiceClient/api_proxy/data_service/GetAssociationByDS.cpp rename to chaos_metadata_service_client/api_proxy/data_service/GetAssociationByDS.cpp index 9308fbd45..1eb66de34 100644 --- a/ChaosMetadataServiceClient/api_proxy/data_service/GetAssociationByDS.cpp +++ b/chaos_metadata_service_client/api_proxy/data_service/GetAssociationByDS.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/data_service/GetAssociationByDS.h> +#include <chaos_metadata_service_client/api_proxy/data_service/GetAssociationByDS.h> using namespace chaos; using namespace chaos::metadata_service_client::api_proxy; @@ -37,4 +37,4 @@ ApiProxyResult GetAssociationByDS::execute(const std::string& ds_unique_id) { common::data::CDataWrapper *message = new common::data::CDataWrapper(); message->addStringValue(NodeDefinitionKey::NODE_UNIQUE_ID, ds_unique_id); return callApi(message); -} \ No newline at end of file +} diff --git a/ChaosMetadataServiceClient/api_proxy/data_service/GetAssociationByDS.h b/chaos_metadata_service_client/api_proxy/data_service/GetAssociationByDS.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/data_service/GetAssociationByDS.h rename to chaos_metadata_service_client/api_proxy/data_service/GetAssociationByDS.h index 742970582..365291b6a 100644 --- a/ChaosMetadataServiceClient/api_proxy/data_service/GetAssociationByDS.h +++ b/chaos_metadata_service_client/api_proxy/data_service/GetAssociationByDS.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__GetAssociationByDS__ #define __CHAOSFramework__GetAssociationByDS__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/data_service/GetBestEndpoints.cpp b/chaos_metadata_service_client/api_proxy/data_service/GetBestEndpoints.cpp similarity index 93% rename from ChaosMetadataServiceClient/api_proxy/data_service/GetBestEndpoints.cpp rename to chaos_metadata_service_client/api_proxy/data_service/GetBestEndpoints.cpp index 7f5a206e0..79f729ea2 100644 --- a/ChaosMetadataServiceClient/api_proxy/data_service/GetBestEndpoints.cpp +++ b/chaos_metadata_service_client/api_proxy/data_service/GetBestEndpoints.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/data_service/GetBestEndpoints.h> +#include <chaos_metadata_service_client/api_proxy/data_service/GetBestEndpoints.h> using namespace chaos; using namespace chaos::metadata_service_client::api_proxy; @@ -36,4 +36,4 @@ ApiProxyResult GetBestEndpoints::execute(int number_of_result) { common::data::CDataWrapper *message = new common::data::CDataWrapper(); message->addInt32Value("count", number_of_result); return callApi(message); -} \ No newline at end of file +} diff --git a/ChaosMetadataServiceClient/api_proxy/data_service/GetBestEndpoints.h b/chaos_metadata_service_client/api_proxy/data_service/GetBestEndpoints.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/data_service/GetBestEndpoints.h rename to chaos_metadata_service_client/api_proxy/data_service/GetBestEndpoints.h index e64029e6c..d1cd16388 100644 --- a/ChaosMetadataServiceClient/api_proxy/data_service/GetBestEndpoints.h +++ b/chaos_metadata_service_client/api_proxy/data_service/GetBestEndpoints.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__GetBestEndpoints__ #define __CHAOSFramework__GetBestEndpoints__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/data_service/NewDS.cpp b/chaos_metadata_service_client/api_proxy/data_service/NewDS.cpp similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/data_service/NewDS.cpp rename to chaos_metadata_service_client/api_proxy/data_service/NewDS.cpp index bb82d6aad..6fd3fa58e 100644 --- a/ChaosMetadataServiceClient/api_proxy/data_service/NewDS.cpp +++ b/chaos_metadata_service_client/api_proxy/data_service/NewDS.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/data_service/NewDS.h> +#include <chaos_metadata_service_client/api_proxy/data_service/NewDS.h> using namespace chaos; using namespace chaos::metadata_service_client::api_proxy; using namespace chaos::metadata_service_client::api_proxy::data_service; @@ -39,4 +39,4 @@ ApiProxyResult NewDS::execute(const std::string& ds_unique_id, message->addStringValue(NodeDefinitionKey::NODE_DIRECT_IO_ADDR, direct_io_address); message->addInt32Value(DataServiceNodeDefinitionKey::DS_DIRECT_IO_ENDPOINT, direct_io_endpoint); return callApi(message); -} \ No newline at end of file +} diff --git a/ChaosMetadataServiceClient/api_proxy/data_service/NewDS.h b/chaos_metadata_service_client/api_proxy/data_service/NewDS.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/data_service/NewDS.h rename to chaos_metadata_service_client/api_proxy/data_service/NewDS.h index a783398f9..413f22d11 100644 --- a/ChaosMetadataServiceClient/api_proxy/data_service/NewDS.h +++ b/chaos_metadata_service_client/api_proxy/data_service/NewDS.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__NewDS__ #define __CHAOSFramework__NewDS__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/data_service/UpdateDS.cpp b/chaos_metadata_service_client/api_proxy/data_service/UpdateDS.cpp similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/data_service/UpdateDS.cpp rename to chaos_metadata_service_client/api_proxy/data_service/UpdateDS.cpp index ad5c7ec93..042141795 100644 --- a/ChaosMetadataServiceClient/api_proxy/data_service/UpdateDS.cpp +++ b/chaos_metadata_service_client/api_proxy/data_service/UpdateDS.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/data_service/UpdateDS.h> +#include <chaos_metadata_service_client/api_proxy/data_service/UpdateDS.h> using namespace chaos; using namespace chaos::metadata_service_client::api_proxy; @@ -41,4 +41,4 @@ ApiProxyResult UpdateDS::execute(const std::string& ds_unique_id, message->addStringValue(NodeDefinitionKey::NODE_DIRECT_IO_ADDR, direct_io_address); message->addInt32Value(DataServiceNodeDefinitionKey::DS_DIRECT_IO_ENDPOINT, direct_io_endpoint); return callApi(message); -} \ No newline at end of file +} diff --git a/ChaosMetadataServiceClient/api_proxy/data_service/UpdateDS.h b/chaos_metadata_service_client/api_proxy/data_service/UpdateDS.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/data_service/UpdateDS.h rename to chaos_metadata_service_client/api_proxy/data_service/UpdateDS.h index 30577a7ff..09117644f 100644 --- a/ChaosMetadataServiceClient/api_proxy/data_service/UpdateDS.h +++ b/chaos_metadata_service_client/api_proxy/data_service/UpdateDS.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__UpdateDS__ #define __CHAOSFramework__UpdateDS__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/data_service/data_service.h b/chaos_metadata_service_client/api_proxy/data_service/data_service.h similarity index 62% rename from ChaosMetadataServiceClient/api_proxy/data_service/data_service.h rename to chaos_metadata_service_client/api_proxy/data_service/data_service.h index c28be91fd..d21a6301b 100644 --- a/ChaosMetadataServiceClient/api_proxy/data_service/data_service.h +++ b/chaos_metadata_service_client/api_proxy/data_service/data_service.h @@ -22,12 +22,12 @@ #ifndef __CHAOSFramework_EBF74BC6_294D_47AB_BAC3_5322AEAFFA19_data_service_h #define __CHAOSFramework_EBF74BC6_294D_47AB_BAC3_5322AEAFFA19_data_service_h -#include <ChaosMetadataServiceClient/api_proxy/data_service/NewDS.h> -#include <ChaosMetadataServiceClient/api_proxy/data_service/UpdateDS.h> -#include <ChaosMetadataServiceClient/api_proxy/data_service/DeleteDS.h> -#include <ChaosMetadataServiceClient/api_proxy/data_service/GetAllDS.h> -#include <ChaosMetadataServiceClient/api_proxy/data_service/GetBestEndpoints.h> -#include <ChaosMetadataServiceClient/api_proxy/data_service/GetAssociationByDS.h> -#include <ChaosMetadataServiceClient/api_proxy/data_service/AssociationControlUnit.h> +#include <chaos_metadata_service_client/api_proxy/data_service/NewDS.h> +#include <chaos_metadata_service_client/api_proxy/data_service/UpdateDS.h> +#include <chaos_metadata_service_client/api_proxy/data_service/DeleteDS.h> +#include <chaos_metadata_service_client/api_proxy/data_service/GetAllDS.h> +#include <chaos_metadata_service_client/api_proxy/data_service/GetBestEndpoints.h> +#include <chaos_metadata_service_client/api_proxy/data_service/GetAssociationByDS.h> +#include <chaos_metadata_service_client/api_proxy/data_service/AssociationControlUnit.h> #endif /* __CHAOSFramework_EBF74BC6_294D_47AB_BAC3_5322AEAFFA19_data_service_h */ diff --git a/ChaosMetadataServiceClient/api_proxy/deploy/EndUploadSession.cpp b/chaos_metadata_service_client/api_proxy/deploy/EndUploadSession.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/deploy/EndUploadSession.cpp rename to chaos_metadata_service_client/api_proxy/deploy/EndUploadSession.cpp index 87ea042da..458385acf 100644 --- a/ChaosMetadataServiceClient/api_proxy/deploy/EndUploadSession.cpp +++ b/chaos_metadata_service_client/api_proxy/deploy/EndUploadSession.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/deploy/EndUploadSession.h> +#include <chaos_metadata_service_client/api_proxy/deploy/EndUploadSession.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/deploy/EndUploadSession.h b/chaos_metadata_service_client/api_proxy/deploy/EndUploadSession.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/deploy/EndUploadSession.h rename to chaos_metadata_service_client/api_proxy/deploy/EndUploadSession.h index 93b0997e0..364efe910 100644 --- a/ChaosMetadataServiceClient/api_proxy/deploy/EndUploadSession.h +++ b/chaos_metadata_service_client/api_proxy/deploy/EndUploadSession.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__05EB286_B216_4E0D_9BA5_67288006CF89_EndUploadSession_h #define __CHAOSFramework__05EB286_B216_4E0D_9BA5_67288006CF89_EndUploadSession_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/deploy/StartUploadSession.cpp b/chaos_metadata_service_client/api_proxy/deploy/StartUploadSession.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/deploy/StartUploadSession.cpp rename to chaos_metadata_service_client/api_proxy/deploy/StartUploadSession.cpp index 75aae61c4..f314d4cdb 100644 --- a/ChaosMetadataServiceClient/api_proxy/deploy/StartUploadSession.cpp +++ b/chaos_metadata_service_client/api_proxy/deploy/StartUploadSession.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/deploy/StartUploadSession.h> +#include <chaos_metadata_service_client/api_proxy/deploy/StartUploadSession.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/deploy/StartUploadSession.h b/chaos_metadata_service_client/api_proxy/deploy/StartUploadSession.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/deploy/StartUploadSession.h rename to chaos_metadata_service_client/api_proxy/deploy/StartUploadSession.h index 9a42fa21c..973c0503f 100644 --- a/ChaosMetadataServiceClient/api_proxy/deploy/StartUploadSession.h +++ b/chaos_metadata_service_client/api_proxy/deploy/StartUploadSession.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__60474DE_BEBE_4042_B28F_32C131E273B0_StartUploadSession_h #define __CHAOSFramework__60474DE_BEBE_4042_B28F_32C131E273B0_StartUploadSession_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/deploy/UploadChunk.cpp b/chaos_metadata_service_client/api_proxy/deploy/UploadChunk.cpp similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/deploy/UploadChunk.cpp rename to chaos_metadata_service_client/api_proxy/deploy/UploadChunk.cpp index bb86de34b..57cb447b7 100644 --- a/ChaosMetadataServiceClient/api_proxy/deploy/UploadChunk.cpp +++ b/chaos_metadata_service_client/api_proxy/deploy/UploadChunk.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/deploy/UploadChunk.h> +#include <chaos_metadata_service_client/api_proxy/deploy/UploadChunk.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/deploy/UploadChunk.h b/chaos_metadata_service_client/api_proxy/deploy/UploadChunk.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/deploy/UploadChunk.h rename to chaos_metadata_service_client/api_proxy/deploy/UploadChunk.h index ad613491f..85fa15176 100644 --- a/ChaosMetadataServiceClient/api_proxy/deploy/UploadChunk.h +++ b/chaos_metadata_service_client/api_proxy/deploy/UploadChunk.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__4FD8B56_78C9_4B54_83C6_B7D303505D2E_UploadChunk_h #define __CHAOSFramework__4FD8B56_78C9_4B54_83C6_B7D303505D2E_UploadChunk_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/deploy/deploy.h b/chaos_metadata_service_client/api_proxy/deploy/deploy.h similarity index 80% rename from ChaosMetadataServiceClient/api_proxy/deploy/deploy.h rename to chaos_metadata_service_client/api_proxy/deploy/deploy.h index bf0dec921..ad974bac0 100644 --- a/ChaosMetadataServiceClient/api_proxy/deploy/deploy.h +++ b/chaos_metadata_service_client/api_proxy/deploy/deploy.h @@ -22,8 +22,8 @@ #ifndef __CHAOSFramework__A716821_6893_4C5B_A3D7_A5907C0BA87A_deploy_h #define __CHAOSFramework__A716821_6893_4C5B_A3D7_A5907C0BA87A_deploy_h -#include <ChaosMetadataServiceClient/api_proxy/deploy/StartUploadSession.h> -#include <ChaosMetadataServiceClient/api_proxy/deploy/UploadChunk.h> -#include <ChaosMetadataServiceClient/api_proxy/deploy/EndUploadSession.h> +#include <chaos_metadata_service_client/api_proxy/deploy/StartUploadSession.h> +#include <chaos_metadata_service_client/api_proxy/deploy/UploadChunk.h> +#include <chaos_metadata_service_client/api_proxy/deploy/EndUploadSession.h> #endif /* __CHAOSFramework__A716821_6893_4C5B_A3D7_A5907C0BA87A_deploy_h */ diff --git a/ChaosMetadataServiceClient/api_proxy/groups/AddNode.cpp b/chaos_metadata_service_client/api_proxy/groups/AddNode.cpp similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/groups/AddNode.cpp rename to chaos_metadata_service_client/api_proxy/groups/AddNode.cpp index 3ac300b78..701cc2a09 100644 --- a/ChaosMetadataServiceClient/api_proxy/groups/AddNode.cpp +++ b/chaos_metadata_service_client/api_proxy/groups/AddNode.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/groups/AddNode.h> +#include <chaos_metadata_service_client/api_proxy/groups/AddNode.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/groups/AddNode.h b/chaos_metadata_service_client/api_proxy/groups/AddNode.h similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/groups/AddNode.h rename to chaos_metadata_service_client/api_proxy/groups/AddNode.h index c78672809..d1c3ac427 100644 --- a/ChaosMetadataServiceClient/api_proxy/groups/AddNode.h +++ b/chaos_metadata_service_client/api_proxy/groups/AddNode.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__AddNode_h #define __CHAOSFramework__AddNode_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { @@ -52,4 +52,4 @@ namespace chaos { } } -#endif /* __CHAOSFramework__GetNodeChilds_h */ \ No newline at end of file +#endif /* __CHAOSFramework__GetNodeChilds_h */ diff --git a/ChaosMetadataServiceClient/api_proxy/groups/DeleteNode.cpp b/chaos_metadata_service_client/api_proxy/groups/DeleteNode.cpp similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/groups/DeleteNode.cpp rename to chaos_metadata_service_client/api_proxy/groups/DeleteNode.cpp index 011c40ec7..5a7cebb78 100644 --- a/ChaosMetadataServiceClient/api_proxy/groups/DeleteNode.cpp +++ b/chaos_metadata_service_client/api_proxy/groups/DeleteNode.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/groups/DeleteNode.h> +#include <chaos_metadata_service_client/api_proxy/groups/DeleteNode.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/groups/DeleteNode.h b/chaos_metadata_service_client/api_proxy/groups/DeleteNode.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/groups/DeleteNode.h rename to chaos_metadata_service_client/api_proxy/groups/DeleteNode.h index 1a153b006..4cd80147f 100644 --- a/ChaosMetadataServiceClient/api_proxy/groups/DeleteNode.h +++ b/chaos_metadata_service_client/api_proxy/groups/DeleteNode.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__DeleteNode_h #define __CHAOSFramework__DeleteNode_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/groups/GetDomains.cpp b/chaos_metadata_service_client/api_proxy/groups/GetDomains.cpp similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/groups/GetDomains.cpp rename to chaos_metadata_service_client/api_proxy/groups/GetDomains.cpp index 086115370..511995bbf 100644 --- a/ChaosMetadataServiceClient/api_proxy/groups/GetDomains.cpp +++ b/chaos_metadata_service_client/api_proxy/groups/GetDomains.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/groups/GetDomains.h> +#include <chaos_metadata_service_client/api_proxy/groups/GetDomains.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/groups/GetDomains.h b/chaos_metadata_service_client/api_proxy/groups/GetDomains.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/groups/GetDomains.h rename to chaos_metadata_service_client/api_proxy/groups/GetDomains.h index 79f6fe144..72f467413 100644 --- a/ChaosMetadataServiceClient/api_proxy/groups/GetDomains.h +++ b/chaos_metadata_service_client/api_proxy/groups/GetDomains.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__GetDomains_h #define __CHAOSFramework__GetDomains_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/groups/GetNodeChilds.cpp b/chaos_metadata_service_client/api_proxy/groups/GetNodeChilds.cpp similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/groups/GetNodeChilds.cpp rename to chaos_metadata_service_client/api_proxy/groups/GetNodeChilds.cpp index 52d4af277..e9951a07a 100644 --- a/ChaosMetadataServiceClient/api_proxy/groups/GetNodeChilds.cpp +++ b/chaos_metadata_service_client/api_proxy/groups/GetNodeChilds.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/groups/GetNodeChilds.h> +#include <chaos_metadata_service_client/api_proxy/groups/GetNodeChilds.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/groups/GetNodeChilds.h b/chaos_metadata_service_client/api_proxy/groups/GetNodeChilds.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/groups/GetNodeChilds.h rename to chaos_metadata_service_client/api_proxy/groups/GetNodeChilds.h index 70a7a6014..3948d13d7 100644 --- a/ChaosMetadataServiceClient/api_proxy/groups/GetNodeChilds.h +++ b/chaos_metadata_service_client/api_proxy/groups/GetNodeChilds.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__GetNodeChilds_h #define __CHAOSFramework__GetNodeChilds_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/groups/groups.h b/chaos_metadata_service_client/api_proxy/groups/groups.h similarity index 76% rename from ChaosMetadataServiceClient/api_proxy/groups/groups.h rename to chaos_metadata_service_client/api_proxy/groups/groups.h index 285ff952b..8b281b3f8 100644 --- a/ChaosMetadataServiceClient/api_proxy/groups/groups.h +++ b/chaos_metadata_service_client/api_proxy/groups/groups.h @@ -22,9 +22,9 @@ #ifndef __CHAOSFramework_FF8A99EE_4B19_4163_9C09_4732F78B9564_groups_h #define __CHAOSFramework_FF8A99EE_4B19_4163_9C09_4732F78B9564_groups_h -#include <ChaosMetadataServiceClient/api_proxy/groups/AddNode.h> -#include <ChaosMetadataServiceClient/api_proxy/groups/DeleteNode.h> -#include <ChaosMetadataServiceClient/api_proxy/groups/GetDomains.h> -#include <ChaosMetadataServiceClient/api_proxy/groups/GetNodeChilds.h> +#include <chaos_metadata_service_client/api_proxy/groups/AddNode.h> +#include <chaos_metadata_service_client/api_proxy/groups/DeleteNode.h> +#include <chaos_metadata_service_client/api_proxy/groups/GetDomains.h> +#include <chaos_metadata_service_client/api_proxy/groups/GetNodeChilds.h> #endif /* __CHAOSFramework_FF8A99EE_4B19_4163_9C09_4732F78B9564_groups_h */ diff --git a/ChaosMetadataServiceClient/api_proxy/logging/GetLogDomainForSourceUID.cpp b/chaos_metadata_service_client/api_proxy/logging/GetLogDomainForSourceUID.cpp similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/logging/GetLogDomainForSourceUID.cpp rename to chaos_metadata_service_client/api_proxy/logging/GetLogDomainForSourceUID.cpp index 04ed923a6..32faf25b5 100644 --- a/ChaosMetadataServiceClient/api_proxy/logging/GetLogDomainForSourceUID.cpp +++ b/chaos_metadata_service_client/api_proxy/logging/GetLogDomainForSourceUID.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/logging/GetLogDomainForSourceUID.h> +#include <chaos_metadata_service_client/api_proxy/logging/GetLogDomainForSourceUID.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/logging/GetLogDomainForSourceUID.h b/chaos_metadata_service_client/api_proxy/logging/GetLogDomainForSourceUID.h similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/logging/GetLogDomainForSourceUID.h rename to chaos_metadata_service_client/api_proxy/logging/GetLogDomainForSourceUID.h index 634ad6b1d..52b5a2865 100644 --- a/ChaosMetadataServiceClient/api_proxy/logging/GetLogDomainForSourceUID.h +++ b/chaos_metadata_service_client/api_proxy/logging/GetLogDomainForSourceUID.h @@ -22,8 +22,8 @@ #ifndef __CHAOSFramework__GetLogDomainForSourceUID_h #define __CHAOSFramework__GetLogDomainForSourceUID_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> -#include <ChaosMetadataServiceClient/api_proxy/logging/logging_types.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/logging/logging_types.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/logging/GetLogForSourceUID.cpp b/chaos_metadata_service_client/api_proxy/logging/GetLogForSourceUID.cpp similarity index 98% rename from ChaosMetadataServiceClient/api_proxy/logging/GetLogForSourceUID.cpp rename to chaos_metadata_service_client/api_proxy/logging/GetLogForSourceUID.cpp index 218c2962e..056d7c998 100644 --- a/ChaosMetadataServiceClient/api_proxy/logging/GetLogForSourceUID.cpp +++ b/chaos_metadata_service_client/api_proxy/logging/GetLogForSourceUID.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/logging/GetLogForSourceUID.h> +#include <chaos_metadata_service_client/api_proxy/logging/GetLogForSourceUID.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/logging/GetLogForSourceUID.h b/chaos_metadata_service_client/api_proxy/logging/GetLogForSourceUID.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/logging/GetLogForSourceUID.h rename to chaos_metadata_service_client/api_proxy/logging/GetLogForSourceUID.h index 54e23a6c2..dd1b7e583 100644 --- a/ChaosMetadataServiceClient/api_proxy/logging/GetLogForSourceUID.h +++ b/chaos_metadata_service_client/api_proxy/logging/GetLogForSourceUID.h @@ -22,8 +22,8 @@ #ifndef __CHAOSFramework__GetLogForSourceUID_h #define __CHAOSFramework__GetLogForSourceUID_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> -#include <ChaosMetadataServiceClient/api_proxy/logging/logging_types.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/logging/logging_types.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/logging/SearchLogEntry.cpp b/chaos_metadata_service_client/api_proxy/logging/SearchLogEntry.cpp similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/logging/SearchLogEntry.cpp rename to chaos_metadata_service_client/api_proxy/logging/SearchLogEntry.cpp index 3ca50b80e..8d0eb4266 100644 --- a/ChaosMetadataServiceClient/api_proxy/logging/SearchLogEntry.cpp +++ b/chaos_metadata_service_client/api_proxy/logging/SearchLogEntry.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/logging/SearchLogEntry.h> +#include <chaos_metadata_service_client/api_proxy/logging/SearchLogEntry.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/logging/SearchLogEntry.h b/chaos_metadata_service_client/api_proxy/logging/SearchLogEntry.h similarity index 93% rename from ChaosMetadataServiceClient/api_proxy/logging/SearchLogEntry.h rename to chaos_metadata_service_client/api_proxy/logging/SearchLogEntry.h index b9a96d68d..0883e34e0 100644 --- a/ChaosMetadataServiceClient/api_proxy/logging/SearchLogEntry.h +++ b/chaos_metadata_service_client/api_proxy/logging/SearchLogEntry.h @@ -23,9 +23,9 @@ #define __CHAOSFramework__SearchLogEntry_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> -#include <ChaosMetadataServiceClient/api_proxy/logging/logging_types.h> -#include <ChaosMetadataServiceClient/api_proxy/logging/GetLogForSourceUID.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/logging/logging_types.h> +#include <chaos_metadata_service_client/api_proxy/logging/GetLogForSourceUID.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/logging/logging.h b/chaos_metadata_service_client/api_proxy/logging/logging.h similarity index 79% rename from ChaosMetadataServiceClient/api_proxy/logging/logging.h rename to chaos_metadata_service_client/api_proxy/logging/logging.h index 1d4bdfafc..e94f976fc 100644 --- a/ChaosMetadataServiceClient/api_proxy/logging/logging.h +++ b/chaos_metadata_service_client/api_proxy/logging/logging.h @@ -22,8 +22,8 @@ #ifndef __CHAOSFramework__DB96A43_83ED_4C1F_8BA5_9B41D053D5CA_logging_h #define __CHAOSFramework__DB96A43_83ED_4C1F_8BA5_9B41D053D5CA_logging_h -#include <ChaosMetadataServiceClient/api_proxy/logging/SearchLogEntry.h> -#include <ChaosMetadataServiceClient/api_proxy/logging/GetLogForSourceUID.h> -#include <ChaosMetadataServiceClient/api_proxy/logging/GetLogDomainForSourceUID.h> +#include <chaos_metadata_service_client/api_proxy/logging/SearchLogEntry.h> +#include <chaos_metadata_service_client/api_proxy/logging/GetLogForSourceUID.h> +#include <chaos_metadata_service_client/api_proxy/logging/GetLogDomainForSourceUID.h> #endif /* __CHAOSFramework__DB96A43_83ED_4C1F_8BA5_9B41D053D5CA_logging_h */ diff --git a/ChaosMetadataServiceClient/api_proxy/logging/logging_types.h b/chaos_metadata_service_client/api_proxy/logging/logging_types.h similarity index 100% rename from ChaosMetadataServiceClient/api_proxy/logging/logging_types.h rename to chaos_metadata_service_client/api_proxy/logging/logging_types.h diff --git a/ChaosMetadataServiceClient/api_proxy/node/ChangeNodeState.cpp b/chaos_metadata_service_client/api_proxy/node/ChangeNodeState.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/node/ChangeNodeState.cpp rename to chaos_metadata_service_client/api_proxy/node/ChangeNodeState.cpp index 7548c1430..aee8ebbbe 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/ChangeNodeState.cpp +++ b/chaos_metadata_service_client/api_proxy/node/ChangeNodeState.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/node/ChangeNodeState.h> +#include <chaos_metadata_service_client/api_proxy/node/ChangeNodeState.h> using namespace chaos::metadata_service_client::api_proxy; using namespace chaos::metadata_service_client::api_proxy::node; @@ -34,4 +34,4 @@ ApiProxyResult ChangeNodeState::execute(const std::string& node_uid, message->addStringValue(chaos::NodeDefinitionKey::NODE_UNIQUE_ID, node_uid); message->addInt32Value("to_state", to_state); return callApi(message); -} \ No newline at end of file +} diff --git a/ChaosMetadataServiceClient/api_proxy/node/ChangeNodeState.h b/chaos_metadata_service_client/api_proxy/node/ChangeNodeState.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/node/ChangeNodeState.h rename to chaos_metadata_service_client/api_proxy/node/ChangeNodeState.h index 5bfb0bb10..52f15908d 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/ChangeNodeState.h +++ b/chaos_metadata_service_client/api_proxy/node/ChangeNodeState.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__ChangeNodeState__ #define __CHAOSFramework__ChangeNodeState__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/node/CommandGet.cpp b/chaos_metadata_service_client/api_proxy/node/CommandGet.cpp similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/node/CommandGet.cpp rename to chaos_metadata_service_client/api_proxy/node/CommandGet.cpp index 5f098732d..5c456b361 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/CommandGet.cpp +++ b/chaos_metadata_service_client/api_proxy/node/CommandGet.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/node/CommandGet.h> +#include <chaos_metadata_service_client/api_proxy/node/CommandGet.h> using namespace chaos::common::data; using namespace chaos::common::batch_command; diff --git a/ChaosMetadataServiceClient/api_proxy/node/CommandGet.h b/chaos_metadata_service_client/api_proxy/node/CommandGet.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/node/CommandGet.h rename to chaos_metadata_service_client/api_proxy/node/CommandGet.h index 983dfb782..494a61237 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/CommandGet.h +++ b/chaos_metadata_service_client/api_proxy/node/CommandGet.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__CommandGet__ #define __CHAOSFramework__CommandGet__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/node/CommandInstanceSubmit.cpp b/chaos_metadata_service_client/api_proxy/node/CommandInstanceSubmit.cpp similarity index 100% rename from ChaosMetadataServiceClient/api_proxy/node/CommandInstanceSubmit.cpp rename to chaos_metadata_service_client/api_proxy/node/CommandInstanceSubmit.cpp diff --git a/ChaosMetadataServiceClient/api_proxy/node/CommandInstanceSubmit.h b/chaos_metadata_service_client/api_proxy/node/CommandInstanceSubmit.h similarity index 100% rename from ChaosMetadataServiceClient/api_proxy/node/CommandInstanceSubmit.h rename to chaos_metadata_service_client/api_proxy/node/CommandInstanceSubmit.h diff --git a/ChaosMetadataServiceClient/api_proxy/node/CommandTemplateDelete.cpp b/chaos_metadata_service_client/api_proxy/node/CommandTemplateDelete.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/node/CommandTemplateDelete.cpp rename to chaos_metadata_service_client/api_proxy/node/CommandTemplateDelete.cpp index 697723050..e5cbba97d 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/CommandTemplateDelete.cpp +++ b/chaos_metadata_service_client/api_proxy/node/CommandTemplateDelete.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/node/CommandTemplateDelete.h> +#include <chaos_metadata_service_client/api_proxy/node/CommandTemplateDelete.h> using namespace chaos::common::data; using namespace chaos::common::batch_command; diff --git a/ChaosMetadataServiceClient/api_proxy/node/CommandTemplateDelete.h b/chaos_metadata_service_client/api_proxy/node/CommandTemplateDelete.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/node/CommandTemplateDelete.h rename to chaos_metadata_service_client/api_proxy/node/CommandTemplateDelete.h index 92411c2fe..4094b42b0 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/CommandTemplateDelete.h +++ b/chaos_metadata_service_client/api_proxy/node/CommandTemplateDelete.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__CommandTemplateDelete__ #define __CHAOSFramework__CommandTemplateDelete__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <string> diff --git a/ChaosMetadataServiceClient/api_proxy/node/CommandTemplateGet.cpp b/chaos_metadata_service_client/api_proxy/node/CommandTemplateGet.cpp similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/node/CommandTemplateGet.cpp rename to chaos_metadata_service_client/api_proxy/node/CommandTemplateGet.cpp index 0ad24bd19..8cd52dcd2 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/CommandTemplateGet.cpp +++ b/chaos_metadata_service_client/api_proxy/node/CommandTemplateGet.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/node/CommandTemplateGet.h> +#include <chaos_metadata_service_client/api_proxy/node/CommandTemplateGet.h> using namespace chaos::common::data; using namespace chaos::common::batch_command; diff --git a/ChaosMetadataServiceClient/api_proxy/node/CommandTemplateGet.h b/chaos_metadata_service_client/api_proxy/node/CommandTemplateGet.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/node/CommandTemplateGet.h rename to chaos_metadata_service_client/api_proxy/node/CommandTemplateGet.h index 91b232840..5d221b36b 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/CommandTemplateGet.h +++ b/chaos_metadata_service_client/api_proxy/node/CommandTemplateGet.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__CommandTemplateGet__ #define __CHAOSFramework__CommandTemplateGet__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <string> diff --git a/ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSearch.cpp b/chaos_metadata_service_client/api_proxy/node/CommandTemplateSearch.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSearch.cpp rename to chaos_metadata_service_client/api_proxy/node/CommandTemplateSearch.cpp index 161f409be..072d8503d 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSearch.cpp +++ b/chaos_metadata_service_client/api_proxy/node/CommandTemplateSearch.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSearch.h> +#include <chaos_metadata_service_client/api_proxy/node/CommandTemplateSearch.h> using namespace chaos::common::data; using namespace chaos::common::batch_command; diff --git a/ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSearch.h b/chaos_metadata_service_client/api_proxy/node/CommandTemplateSearch.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSearch.h rename to chaos_metadata_service_client/api_proxy/node/CommandTemplateSearch.h index 8525d8bb2..b70eb6fb1 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSearch.h +++ b/chaos_metadata_service_client/api_proxy/node/CommandTemplateSearch.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__CommandTemplateSearch__ #define __CHAOSFramework__CommandTemplateSearch__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <string> diff --git a/ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSet.cpp b/chaos_metadata_service_client/api_proxy/node/CommandTemplateSet.cpp similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSet.cpp rename to chaos_metadata_service_client/api_proxy/node/CommandTemplateSet.cpp index 0f2ed3930..bbff8e777 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSet.cpp +++ b/chaos_metadata_service_client/api_proxy/node/CommandTemplateSet.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSet.h> +#include <chaos_metadata_service_client/api_proxy/node/CommandTemplateSet.h> using namespace chaos::common::data; using namespace chaos::common::batch_command; diff --git a/ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSet.h b/chaos_metadata_service_client/api_proxy/node/CommandTemplateSet.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSet.h rename to chaos_metadata_service_client/api_proxy/node/CommandTemplateSet.h index 2ddd80483..5d64bd883 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSet.h +++ b/chaos_metadata_service_client/api_proxy/node/CommandTemplateSet.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__CommandTemplateSet__ #define __CHAOSFramework__CommandTemplateSet__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/data/CDataWrapperKeyValueSetter.h> #include <vector> diff --git a/ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSubmit.cpp b/chaos_metadata_service_client/api_proxy/node/CommandTemplateSubmit.cpp similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSubmit.cpp rename to chaos_metadata_service_client/api_proxy/node/CommandTemplateSubmit.cpp index 7dad2c379..5f32f5533 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSubmit.cpp +++ b/chaos_metadata_service_client/api_proxy/node/CommandTemplateSubmit.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSubmit.h> +#include <chaos_metadata_service_client/api_proxy/node/CommandTemplateSubmit.h> using namespace chaos::common::data; using namespace chaos::common::batch_command; diff --git a/ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSubmit.h b/chaos_metadata_service_client/api_proxy/node/CommandTemplateSubmit.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSubmit.h rename to chaos_metadata_service_client/api_proxy/node/CommandTemplateSubmit.h index af6fd499b..59c752f66 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSubmit.h +++ b/chaos_metadata_service_client/api_proxy/node/CommandTemplateSubmit.h @@ -21,7 +21,7 @@ #ifndef __CHAOSFramework__CommandTemplateSubmit__ #define __CHAOSFramework__CommandTemplateSubmit__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <string> diff --git a/ChaosMetadataServiceClient/api_proxy/node/GetCommandAndTemplateDescription.cpp b/chaos_metadata_service_client/api_proxy/node/GetCommandAndTemplateDescription.cpp similarity index 100% rename from ChaosMetadataServiceClient/api_proxy/node/GetCommandAndTemplateDescription.cpp rename to chaos_metadata_service_client/api_proxy/node/GetCommandAndTemplateDescription.cpp diff --git a/ChaosMetadataServiceClient/api_proxy/node/GetCommandAndTemplateDescription.h b/chaos_metadata_service_client/api_proxy/node/GetCommandAndTemplateDescription.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/node/GetCommandAndTemplateDescription.h rename to chaos_metadata_service_client/api_proxy/node/GetCommandAndTemplateDescription.h index e2209656e..11952b982 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/GetCommandAndTemplateDescription.h +++ b/chaos_metadata_service_client/api_proxy/node/GetCommandAndTemplateDescription.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__GetCommandAndTemplateDescription__ #define __CHAOSFramework__GetCommandAndTemplateDescription__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <string> diff --git a/ChaosMetadataServiceClient/api_proxy/node/GetNodeDescription.cpp b/chaos_metadata_service_client/api_proxy/node/GetNodeDescription.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/node/GetNodeDescription.cpp rename to chaos_metadata_service_client/api_proxy/node/GetNodeDescription.cpp index 83e10210c..2d7c97ca8 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/GetNodeDescription.cpp +++ b/chaos_metadata_service_client/api_proxy/node/GetNodeDescription.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/node/GetNodeDescription.h> +#include <chaos_metadata_service_client/api_proxy/node/GetNodeDescription.h> using namespace chaos::metadata_service_client::api_proxy; using namespace chaos::metadata_service_client::api_proxy::node; @@ -34,4 +34,4 @@ ApiProxyResult GetNodeDescription::execute(const std::string& unique_node_id) { chaos::common::data::CDataWrapper *message = new chaos::common::data::CDataWrapper(); message->addStringValue(chaos::NodeDefinitionKey::NODE_UNIQUE_ID, unique_node_id); return callApi(message); -} \ No newline at end of file +} diff --git a/ChaosMetadataServiceClient/api_proxy/node/GetNodeDescription.h b/chaos_metadata_service_client/api_proxy/node/GetNodeDescription.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/node/GetNodeDescription.h rename to chaos_metadata_service_client/api_proxy/node/GetNodeDescription.h index 9204ba8f9..38cfa6169 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/GetNodeDescription.h +++ b/chaos_metadata_service_client/api_proxy/node/GetNodeDescription.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__GetNodeDescription__ #define __CHAOSFramework__GetNodeDescription__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/node/NodeSearch.cpp b/chaos_metadata_service_client/api_proxy/node/NodeSearch.cpp similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/node/NodeSearch.cpp rename to chaos_metadata_service_client/api_proxy/node/NodeSearch.cpp index 002e441fc..d2455396b 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/NodeSearch.cpp +++ b/chaos_metadata_service_client/api_proxy/node/NodeSearch.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/node/NodeSearch.h> +#include <chaos_metadata_service_client/api_proxy/node/NodeSearch.h> using namespace chaos::metadata_service_client::api_proxy; using namespace chaos::metadata_service_client::api_proxy::node; diff --git a/ChaosMetadataServiceClient/api_proxy/node/NodeSearch.h b/chaos_metadata_service_client/api_proxy/node/NodeSearch.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/node/NodeSearch.h rename to chaos_metadata_service_client/api_proxy/node/NodeSearch.h index 5ac4b2ebd..bc6e513d6 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/NodeSearch.h +++ b/chaos_metadata_service_client/api_proxy/node/NodeSearch.h @@ -21,7 +21,7 @@ #ifndef __CHAOSFramework__NodeSearch__ #define __CHAOSFramework__NodeSearch__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/node/UpdateProperty.cpp b/chaos_metadata_service_client/api_proxy/node/UpdateProperty.cpp similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/node/UpdateProperty.cpp rename to chaos_metadata_service_client/api_proxy/node/UpdateProperty.cpp index 1e912ab5e..b6ab562f1 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/UpdateProperty.cpp +++ b/chaos_metadata_service_client/api_proxy/node/UpdateProperty.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/node/UpdateProperty.h> +#include <chaos_metadata_service_client/api_proxy/node/UpdateProperty.h> using namespace chaos::common::data; using namespace chaos::common::batch_command; diff --git a/ChaosMetadataServiceClient/api_proxy/node/UpdateProperty.h b/chaos_metadata_service_client/api_proxy/node/UpdateProperty.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/node/UpdateProperty.h rename to chaos_metadata_service_client/api_proxy/node/UpdateProperty.h index a6d2dac45..e9c70cd78 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/UpdateProperty.h +++ b/chaos_metadata_service_client/api_proxy/node/UpdateProperty.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__UpdateProperty__ #define __CHAOSFramework__UpdateProperty__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/node/node.h b/chaos_metadata_service_client/api_proxy/node/node.h similarity index 51% rename from ChaosMetadataServiceClient/api_proxy/node/node.h rename to chaos_metadata_service_client/api_proxy/node/node.h index 0cae8adb4..a91c6bcac 100644 --- a/ChaosMetadataServiceClient/api_proxy/node/node.h +++ b/chaos_metadata_service_client/api_proxy/node/node.h @@ -22,16 +22,16 @@ #ifndef __CHAOSFramework_B52252F5_64C5_47BD_9733_7D4DE2B260AF_node_h #define __CHAOSFramework_B52252F5_64C5_47BD_9733_7D4DE2B260AF_node_h -#include <ChaosMetadataServiceClient/api_proxy/node/NodeSearch.h> -#include <ChaosMetadataServiceClient/api_proxy/node/CommandGet.h> -#include <ChaosMetadataServiceClient/api_proxy/node/UpdateProperty.h> -#include <ChaosMetadataServiceClient/api_proxy/node/ChangeNodeState.h> -#include <ChaosMetadataServiceClient/api_proxy/node/GetNodeDescription.h> -#include <ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSet.h> -#include <ChaosMetadataServiceClient/api_proxy/node/CommandTemplateGet.h> -#include <ChaosMetadataServiceClient/api_proxy/node/CommandTemplateDelete.h> -#include <ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSearch.h> -#include <ChaosMetadataServiceClient/api_proxy/node/CommandTemplateSubmit.h> -#include <ChaosMetadataServiceClient/api_proxy/node/GetCommandAndTemplateDescription.h> +#include <chaos_metadata_service_client/api_proxy/node/NodeSearch.h> +#include <chaos_metadata_service_client/api_proxy/node/CommandGet.h> +#include <chaos_metadata_service_client/api_proxy/node/UpdateProperty.h> +#include <chaos_metadata_service_client/api_proxy/node/ChangeNodeState.h> +#include <chaos_metadata_service_client/api_proxy/node/GetNodeDescription.h> +#include <chaos_metadata_service_client/api_proxy/node/CommandTemplateSet.h> +#include <chaos_metadata_service_client/api_proxy/node/CommandTemplateGet.h> +#include <chaos_metadata_service_client/api_proxy/node/CommandTemplateDelete.h> +#include <chaos_metadata_service_client/api_proxy/node/CommandTemplateSearch.h> +#include <chaos_metadata_service_client/api_proxy/node/CommandTemplateSubmit.h> +#include <chaos_metadata_service_client/api_proxy/node/GetCommandAndTemplateDescription.h> #endif /* __CHAOSFramework_B52252F5_64C5_47BD_9733_7D4DE2B260AF_node_h */ diff --git a/ChaosMetadataServiceClient/api_proxy/script/LoadFullScript.cpp b/chaos_metadata_service_client/api_proxy/script/LoadFullScript.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/script/LoadFullScript.cpp rename to chaos_metadata_service_client/api_proxy/script/LoadFullScript.cpp index 4b2fa965c..aa1d835ff 100644 --- a/ChaosMetadataServiceClient/api_proxy/script/LoadFullScript.cpp +++ b/chaos_metadata_service_client/api_proxy/script/LoadFullScript.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/script/LoadFullScript.h> +#include <chaos_metadata_service_client/api_proxy/script/LoadFullScript.h> using namespace chaos::common::data; using namespace chaos::service_common::data::script; diff --git a/ChaosMetadataServiceClient/api_proxy/script/LoadFullScript.h b/chaos_metadata_service_client/api_proxy/script/LoadFullScript.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/script/LoadFullScript.h rename to chaos_metadata_service_client/api_proxy/script/LoadFullScript.h index 63dea7e25..2e4647c8a 100644 --- a/ChaosMetadataServiceClient/api_proxy/script/LoadFullScript.h +++ b/chaos_metadata_service_client/api_proxy/script/LoadFullScript.h @@ -23,7 +23,7 @@ #define __CHAOSFramework_CB5EEE12_458C_45E7_82AD_23562A6844ED_LoadFullScript_h #include <chaos_service_common/data/script/Script.h> -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/script/ManageScriptInstance.cpp b/chaos_metadata_service_client/api_proxy/script/ManageScriptInstance.cpp similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/script/ManageScriptInstance.cpp rename to chaos_metadata_service_client/api_proxy/script/ManageScriptInstance.cpp index 7f4806968..74ea657c0 100644 --- a/ChaosMetadataServiceClient/api_proxy/script/ManageScriptInstance.cpp +++ b/chaos_metadata_service_client/api_proxy/script/ManageScriptInstance.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/script/ManageScriptInstance.h> +#include <chaos_metadata_service_client/api_proxy/script/ManageScriptInstance.h> using namespace chaos::common::data; using namespace chaos::service_common::data::script; diff --git a/ChaosMetadataServiceClient/api_proxy/script/ManageScriptInstance.h b/chaos_metadata_service_client/api_proxy/script/ManageScriptInstance.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/script/ManageScriptInstance.h rename to chaos_metadata_service_client/api_proxy/script/ManageScriptInstance.h index 3461c8adf..a08a3ef70 100644 --- a/ChaosMetadataServiceClient/api_proxy/script/ManageScriptInstance.h +++ b/chaos_metadata_service_client/api_proxy/script/ManageScriptInstance.h @@ -23,7 +23,7 @@ #define __CHAOSFramework_F6F210A6_CA50_46F8_8F1F_6A71749DB42D_ManageScriptInstance_h #include <chaos_service_common/data/script/Script.h> -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/script/RemoveScript.cpp b/chaos_metadata_service_client/api_proxy/script/RemoveScript.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/script/RemoveScript.cpp rename to chaos_metadata_service_client/api_proxy/script/RemoveScript.cpp index 741ad5f08..9fb2ede63 100644 --- a/ChaosMetadataServiceClient/api_proxy/script/RemoveScript.cpp +++ b/chaos_metadata_service_client/api_proxy/script/RemoveScript.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/script/RemoveScript.h> +#include <chaos_metadata_service_client/api_proxy/script/RemoveScript.h> using namespace chaos::common::data; using namespace chaos::service_common::data::script; diff --git a/ChaosMetadataServiceClient/api_proxy/script/RemoveScript.h b/chaos_metadata_service_client/api_proxy/script/RemoveScript.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/script/RemoveScript.h rename to chaos_metadata_service_client/api_proxy/script/RemoveScript.h index 818d43a64..0a47fcc7c 100644 --- a/ChaosMetadataServiceClient/api_proxy/script/RemoveScript.h +++ b/chaos_metadata_service_client/api_proxy/script/RemoveScript.h @@ -23,7 +23,7 @@ #define __CHAOSFramework__F805028_2A5B_4E14_AD9E_5B2C6874A4AC_RemoveScript_h #include <chaos_service_common/data/script/Script.h> -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/script/SaveScript.cpp b/chaos_metadata_service_client/api_proxy/script/SaveScript.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/script/SaveScript.cpp rename to chaos_metadata_service_client/api_proxy/script/SaveScript.cpp index 4893f6092..539a60fe4 100644 --- a/ChaosMetadataServiceClient/api_proxy/script/SaveScript.cpp +++ b/chaos_metadata_service_client/api_proxy/script/SaveScript.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/script/SaveScript.h> +#include <chaos_metadata_service_client/api_proxy/script/SaveScript.h> using namespace chaos::service_common::data::script; using namespace chaos::metadata_service_client::api_proxy; diff --git a/ChaosMetadataServiceClient/api_proxy/script/SaveScript.h b/chaos_metadata_service_client/api_proxy/script/SaveScript.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/script/SaveScript.h rename to chaos_metadata_service_client/api_proxy/script/SaveScript.h index 0288cc459..76c9277dd 100644 --- a/ChaosMetadataServiceClient/api_proxy/script/SaveScript.h +++ b/chaos_metadata_service_client/api_proxy/script/SaveScript.h @@ -23,7 +23,7 @@ #define __CHAOSFramework__E72899A_3BC7_42C8_80C3_E0294CC429D5_SaveScript_h #include <chaos_service_common/data/script/Script.h> -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/script/SearchInstancesForScript.cpp b/chaos_metadata_service_client/api_proxy/script/SearchInstancesForScript.cpp similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/script/SearchInstancesForScript.cpp rename to chaos_metadata_service_client/api_proxy/script/SearchInstancesForScript.cpp index fff048783..619006df6 100644 --- a/ChaosMetadataServiceClient/api_proxy/script/SearchInstancesForScript.cpp +++ b/chaos_metadata_service_client/api_proxy/script/SearchInstancesForScript.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/script/SearchInstancesForScript.h> +#include <chaos_metadata_service_client/api_proxy/script/SearchInstancesForScript.h> #include <chaos/common/data/structured/Lists.h> diff --git a/ChaosMetadataServiceClient/api_proxy/script/SearchInstancesForScript.h b/chaos_metadata_service_client/api_proxy/script/SearchInstancesForScript.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/script/SearchInstancesForScript.h rename to chaos_metadata_service_client/api_proxy/script/SearchInstancesForScript.h index 891086be6..4a5d85379 100644 --- a/ChaosMetadataServiceClient/api_proxy/script/SearchInstancesForScript.h +++ b/chaos_metadata_service_client/api_proxy/script/SearchInstancesForScript.h @@ -23,7 +23,7 @@ #define __CHAOSFramework_FDFC9046_54C9_4032_B775_70F29A8A8C1C_SearchInstancesForScript_h #include <chaos_service_common/data/script/Script.h> -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/script/SearchScript.cpp b/chaos_metadata_service_client/api_proxy/script/SearchScript.cpp similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/script/SearchScript.cpp rename to chaos_metadata_service_client/api_proxy/script/SearchScript.cpp index a928a2d6c..f93d0a3c8 100644 --- a/ChaosMetadataServiceClient/api_proxy/script/SearchScript.cpp +++ b/chaos_metadata_service_client/api_proxy/script/SearchScript.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/script/SearchScript.h> +#include <chaos_metadata_service_client/api_proxy/script/SearchScript.h> using namespace chaos::common::data; using namespace chaos::service_common::data::script; diff --git a/ChaosMetadataServiceClient/api_proxy/script/SearchScript.h b/chaos_metadata_service_client/api_proxy/script/SearchScript.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/script/SearchScript.h rename to chaos_metadata_service_client/api_proxy/script/SearchScript.h index f2e9c27a2..8546b01ad 100644 --- a/ChaosMetadataServiceClient/api_proxy/script/SearchScript.h +++ b/chaos_metadata_service_client/api_proxy/script/SearchScript.h @@ -23,7 +23,7 @@ #define __CHAOSFramework__D12F532_496B_406D_8B49_AB2851CCFDD0_SearchScript_h #include <chaos_service_common/data/script/Script.h> -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/script/UpdateBindType.cpp b/chaos_metadata_service_client/api_proxy/script/UpdateBindType.cpp similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/script/UpdateBindType.cpp rename to chaos_metadata_service_client/api_proxy/script/UpdateBindType.cpp index 656b1152b..5885c813c 100644 --- a/ChaosMetadataServiceClient/api_proxy/script/UpdateBindType.cpp +++ b/chaos_metadata_service_client/api_proxy/script/UpdateBindType.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/script/UpdateBindType.h> +#include <chaos_metadata_service_client/api_proxy/script/UpdateBindType.h> #include <chaos/common/chaos_constants.h> #include <chaos/common/data/structured/Lists.h> diff --git a/ChaosMetadataServiceClient/api_proxy/script/UpdateBindType.h b/chaos_metadata_service_client/api_proxy/script/UpdateBindType.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/script/UpdateBindType.h rename to chaos_metadata_service_client/api_proxy/script/UpdateBindType.h index 4a96563f8..2ed8c6ffd 100644 --- a/ChaosMetadataServiceClient/api_proxy/script/UpdateBindType.h +++ b/chaos_metadata_service_client/api_proxy/script/UpdateBindType.h @@ -23,7 +23,7 @@ #define __CHAOSFramework_E77F92DE_D8B6_4286_9ABF_850CFD93CDD2_UpdateBindType_h #include <chaos_service_common/data/script/Script.h> -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/script/UpdateScriptOnNode.cpp b/chaos_metadata_service_client/api_proxy/script/UpdateScriptOnNode.cpp similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/script/UpdateScriptOnNode.cpp rename to chaos_metadata_service_client/api_proxy/script/UpdateScriptOnNode.cpp index 2721002c1..9a6c03fb6 100644 --- a/ChaosMetadataServiceClient/api_proxy/script/UpdateScriptOnNode.cpp +++ b/chaos_metadata_service_client/api_proxy/script/UpdateScriptOnNode.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/script/UpdateScriptOnNode.h> +#include <chaos_metadata_service_client/api_proxy/script/UpdateScriptOnNode.h> #include <chaos/common/chaos_constants.h> diff --git a/ChaosMetadataServiceClient/api_proxy/script/UpdateScriptOnNode.h b/chaos_metadata_service_client/api_proxy/script/UpdateScriptOnNode.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/script/UpdateScriptOnNode.h rename to chaos_metadata_service_client/api_proxy/script/UpdateScriptOnNode.h index 9336cc1e0..3606eb4c4 100644 --- a/ChaosMetadataServiceClient/api_proxy/script/UpdateScriptOnNode.h +++ b/chaos_metadata_service_client/api_proxy/script/UpdateScriptOnNode.h @@ -23,7 +23,7 @@ #define __CHAOSFramework_AC7D1F8B_B75A_4433_958A_5D55485CE572_UpdateScriptOnNode_h #include <chaos_service_common/data/script/Script.h> -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/script/script.h b/chaos_metadata_service_client/api_proxy/script/script.h similarity index 60% rename from ChaosMetadataServiceClient/api_proxy/script/script.h rename to chaos_metadata_service_client/api_proxy/script/script.h index 834b689a8..92bcc4171 100644 --- a/ChaosMetadataServiceClient/api_proxy/script/script.h +++ b/chaos_metadata_service_client/api_proxy/script/script.h @@ -22,13 +22,13 @@ #ifndef __CHAOSFramework_F951FF55_A546_4753_8859_3E5E05C482CA_script_h #define __CHAOSFramework_F951FF55_A546_4753_8859_3E5E05C482CA_script_h -#include <ChaosMetadataServiceClient/api_proxy/script/SaveScript.h> -#include <ChaosMetadataServiceClient/api_proxy/script/RemoveScript.h> -#include <ChaosMetadataServiceClient/api_proxy/script/SearchScript.h> -#include <ChaosMetadataServiceClient/api_proxy/script/UpdateBindType.h> -#include <ChaosMetadataServiceClient/api_proxy/script/LoadFullScript.h> -#include <ChaosMetadataServiceClient/api_proxy/script/UpdateScriptOnNode.h> -#include <ChaosMetadataServiceClient/api_proxy/script/ManageScriptInstance.h> -#include <ChaosMetadataServiceClient/api_proxy/script/SearchInstancesForScript.h> +#include <chaos_metadata_service_client/api_proxy/script/SaveScript.h> +#include <chaos_metadata_service_client/api_proxy/script/RemoveScript.h> +#include <chaos_metadata_service_client/api_proxy/script/SearchScript.h> +#include <chaos_metadata_service_client/api_proxy/script/UpdateBindType.h> +#include <chaos_metadata_service_client/api_proxy/script/LoadFullScript.h> +#include <chaos_metadata_service_client/api_proxy/script/UpdateScriptOnNode.h> +#include <chaos_metadata_service_client/api_proxy/script/ManageScriptInstance.h> +#include <chaos_metadata_service_client/api_proxy/script/SearchInstancesForScript.h> #endif /* __CHAOSFramework_F951FF55_A546_4753_8859_3E5E05C482CA_script_h */ diff --git a/ChaosMetadataServiceClient/api_proxy/service/CreateNewSnapshot.cpp b/chaos_metadata_service_client/api_proxy/service/CreateNewSnapshot.cpp similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/service/CreateNewSnapshot.cpp rename to chaos_metadata_service_client/api_proxy/service/CreateNewSnapshot.cpp index dd6b93e0b..d5a228fea 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/CreateNewSnapshot.cpp +++ b/chaos_metadata_service_client/api_proxy/service/CreateNewSnapshot.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/service/CreateNewSnapshot.h> +#include <chaos_metadata_service_client/api_proxy/service/CreateNewSnapshot.h> using namespace chaos; using namespace chaos::metadata_service_client::api_proxy; diff --git a/ChaosMetadataServiceClient/api_proxy/service/CreateNewSnapshot.h b/chaos_metadata_service_client/api_proxy/service/CreateNewSnapshot.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/service/CreateNewSnapshot.h rename to chaos_metadata_service_client/api_proxy/service/CreateNewSnapshot.h index 57a59126a..7a6ece81b 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/CreateNewSnapshot.h +++ b/chaos_metadata_service_client/api_proxy/service/CreateNewSnapshot.h @@ -24,7 +24,7 @@ #include <chaos/common/chaos_types.h> -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/service/DeleteSnapshot.cpp b/chaos_metadata_service_client/api_proxy/service/DeleteSnapshot.cpp similarity index 93% rename from ChaosMetadataServiceClient/api_proxy/service/DeleteSnapshot.cpp rename to chaos_metadata_service_client/api_proxy/service/DeleteSnapshot.cpp index 0509a0ce7..d56bc7411 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/DeleteSnapshot.cpp +++ b/chaos_metadata_service_client/api_proxy/service/DeleteSnapshot.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/service/DeleteSnapshot.h> +#include <chaos_metadata_service_client/api_proxy/service/DeleteSnapshot.h> using namespace chaos; using namespace chaos::metadata_service_client::api_proxy; @@ -36,4 +36,4 @@ ApiProxyResult DeleteSnapshot::execute(const std::string& snapshot_name) { common::data::CDataWrapper *message = new common::data::CDataWrapper(); message->addStringValue("snapshot_name", snapshot_name); return callApi(message); -} \ No newline at end of file +} diff --git a/ChaosMetadataServiceClient/api_proxy/service/DeleteSnapshot.h b/chaos_metadata_service_client/api_proxy/service/DeleteSnapshot.h similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/service/DeleteSnapshot.h rename to chaos_metadata_service_client/api_proxy/service/DeleteSnapshot.h index 46afe450a..bc18630b5 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/DeleteSnapshot.h +++ b/chaos_metadata_service_client/api_proxy/service/DeleteSnapshot.h @@ -22,7 +22,7 @@ #ifndef __MetadataServiceClient__DeleteSnapshot_h #define __MetadataServiceClient__DeleteSnapshot_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/service/GetAllSnapshot.cpp b/chaos_metadata_service_client/api_proxy/service/GetAllSnapshot.cpp similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/service/GetAllSnapshot.cpp rename to chaos_metadata_service_client/api_proxy/service/GetAllSnapshot.cpp index 63bb2a357..f4bb97e64 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/GetAllSnapshot.cpp +++ b/chaos_metadata_service_client/api_proxy/service/GetAllSnapshot.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/service/GetAllSnapshot.h> +#include <chaos_metadata_service_client/api_proxy/service/GetAllSnapshot.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/service/GetAllSnapshot.h b/chaos_metadata_service_client/api_proxy/service/GetAllSnapshot.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/service/GetAllSnapshot.h rename to chaos_metadata_service_client/api_proxy/service/GetAllSnapshot.h index 992ab8144..a116d0b68 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/GetAllSnapshot.h +++ b/chaos_metadata_service_client/api_proxy/service/GetAllSnapshot.h @@ -22,7 +22,7 @@ #ifndef __MetadataServiceClient__GetAllSnapshot_h #define __MetadataServiceClient__GetAllSnapshot_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/service/GetNodesForSnapshot.cpp b/chaos_metadata_service_client/api_proxy/service/GetNodesForSnapshot.cpp similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/service/GetNodesForSnapshot.cpp rename to chaos_metadata_service_client/api_proxy/service/GetNodesForSnapshot.cpp index 81dc3e25e..33cb35116 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/GetNodesForSnapshot.cpp +++ b/chaos_metadata_service_client/api_proxy/service/GetNodesForSnapshot.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/service/GetNodesForSnapshot.h> +#include <chaos_metadata_service_client/api_proxy/service/GetNodesForSnapshot.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/service/GetNodesForSnapshot.h b/chaos_metadata_service_client/api_proxy/service/GetNodesForSnapshot.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/service/GetNodesForSnapshot.h rename to chaos_metadata_service_client/api_proxy/service/GetNodesForSnapshot.h index a4ed5ae7d..28497d83e 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/GetNodesForSnapshot.h +++ b/chaos_metadata_service_client/api_proxy/service/GetNodesForSnapshot.h @@ -22,7 +22,7 @@ #ifndef __MetadataServiceClient__GetNodesForSnapshot_h #define __MetadataServiceClient__GetNodesForSnapshot_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/service/GetSnapshotDatasetForNode.cpp b/chaos_metadata_service_client/api_proxy/service/GetSnapshotDatasetForNode.cpp similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/service/GetSnapshotDatasetForNode.cpp rename to chaos_metadata_service_client/api_proxy/service/GetSnapshotDatasetForNode.cpp index 3b7357d2c..74570ca09 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/GetSnapshotDatasetForNode.cpp +++ b/chaos_metadata_service_client/api_proxy/service/GetSnapshotDatasetForNode.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/service/GetSnapshotDatasetForNode.h> +#include <chaos_metadata_service_client/api_proxy/service/GetSnapshotDatasetForNode.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/service/GetSnapshotDatasetForNode.h b/chaos_metadata_service_client/api_proxy/service/GetSnapshotDatasetForNode.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/service/GetSnapshotDatasetForNode.h rename to chaos_metadata_service_client/api_proxy/service/GetSnapshotDatasetForNode.h index 9ac511e8f..89d14b8fb 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/GetSnapshotDatasetForNode.h +++ b/chaos_metadata_service_client/api_proxy/service/GetSnapshotDatasetForNode.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__BC1FE42_4591_4D85_AEA4_439B4E66336E_GetSnapshotDatasetForNode_h #define __CHAOSFramework__BC1FE42_4591_4D85_AEA4_439B4E66336E_GetSnapshotDatasetForNode_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/service/GetSnapshotForNode.cpp b/chaos_metadata_service_client/api_proxy/service/GetSnapshotForNode.cpp similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/service/GetSnapshotForNode.cpp rename to chaos_metadata_service_client/api_proxy/service/GetSnapshotForNode.cpp index 591620dc9..8a90088d2 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/GetSnapshotForNode.cpp +++ b/chaos_metadata_service_client/api_proxy/service/GetSnapshotForNode.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/service/GetSnapshotForNode.h> +#include <chaos_metadata_service_client/api_proxy/service/GetSnapshotForNode.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/service/GetSnapshotForNode.h b/chaos_metadata_service_client/api_proxy/service/GetSnapshotForNode.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/service/GetSnapshotForNode.h rename to chaos_metadata_service_client/api_proxy/service/GetSnapshotForNode.h index ce6186b2e..c99cda0c4 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/GetSnapshotForNode.h +++ b/chaos_metadata_service_client/api_proxy/service/GetSnapshotForNode.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework_BA15D1C2_31C9_47E4_BEED_93B9DAD674CA_GetSnapshotForNode_h #define __CHAOSFramework_BA15D1C2_31C9_47E4_BEED_93B9DAD674CA_GetSnapshotForNode_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/service/GetVariable.cpp b/chaos_metadata_service_client/api_proxy/service/GetVariable.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/service/GetVariable.cpp rename to chaos_metadata_service_client/api_proxy/service/GetVariable.cpp index 8f6e4c542..d41bbf415 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/GetVariable.cpp +++ b/chaos_metadata_service_client/api_proxy/service/GetVariable.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/service/GetVariable.h> +#include <chaos_metadata_service_client/api_proxy/service/GetVariable.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/service/GetVariable.h b/chaos_metadata_service_client/api_proxy/service/GetVariable.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/service/GetVariable.h rename to chaos_metadata_service_client/api_proxy/service/GetVariable.h index f8ebc7299..6f966d46a 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/GetVariable.h +++ b/chaos_metadata_service_client/api_proxy/service/GetVariable.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework_DD2153F3_FDAC_449B_9E83_4033729A18F4_GetVariable_h #define __CHAOSFramework_DD2153F3_FDAC_449B_9E83_4033729A18F4_GetVariable_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/service/RemoveVariable.cpp b/chaos_metadata_service_client/api_proxy/service/RemoveVariable.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/service/RemoveVariable.cpp rename to chaos_metadata_service_client/api_proxy/service/RemoveVariable.cpp index 42b91f265..9a1dad427 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/RemoveVariable.cpp +++ b/chaos_metadata_service_client/api_proxy/service/RemoveVariable.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/service/RemoveVariable.h> +#include <chaos_metadata_service_client/api_proxy/service/RemoveVariable.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/service/RemoveVariable.h b/chaos_metadata_service_client/api_proxy/service/RemoveVariable.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/service/RemoveVariable.h rename to chaos_metadata_service_client/api_proxy/service/RemoveVariable.h index 3066cb9bd..0d6d99eca 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/RemoveVariable.h +++ b/chaos_metadata_service_client/api_proxy/service/RemoveVariable.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__F2638D4_8C03_4409_AC74_67CDC2704941_RemoveVariable_h #define __CHAOSFramework__F2638D4_8C03_4409_AC74_67CDC2704941_RemoveVariable_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/service/ResetAll.cpp b/chaos_metadata_service_client/api_proxy/service/ResetAll.cpp similarity index 93% rename from ChaosMetadataServiceClient/api_proxy/service/ResetAll.cpp rename to chaos_metadata_service_client/api_proxy/service/ResetAll.cpp index 49499f4ac..b2983546d 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/ResetAll.cpp +++ b/chaos_metadata_service_client/api_proxy/service/ResetAll.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/service/ResetAll.h> +#include <chaos_metadata_service_client/api_proxy/service/ResetAll.h> using namespace chaos; using namespace chaos::metadata_service_client::api_proxy; using namespace chaos::metadata_service_client::api_proxy::service; @@ -33,4 +33,4 @@ API_PROXY_CD_DEFINITION(ResetAll, */ ApiProxyResult ResetAll::execute() { return callApi(); -} \ No newline at end of file +} diff --git a/ChaosMetadataServiceClient/api_proxy/service/ResetAll.h b/chaos_metadata_service_client/api_proxy/service/ResetAll.h similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/service/ResetAll.h rename to chaos_metadata_service_client/api_proxy/service/ResetAll.h index 7033fd080..876b42c13 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/ResetAll.h +++ b/chaos_metadata_service_client/api_proxy/service/ResetAll.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__ResetAll__ #define __CHAOSFramework__ResetAll__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/service/RestoreSnapshot.cpp b/chaos_metadata_service_client/api_proxy/service/RestoreSnapshot.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/service/RestoreSnapshot.cpp rename to chaos_metadata_service_client/api_proxy/service/RestoreSnapshot.cpp index 89a485a86..6f3ebfd14 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/RestoreSnapshot.cpp +++ b/chaos_metadata_service_client/api_proxy/service/RestoreSnapshot.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/service/RestoreSnapshot.h> +#include <chaos_metadata_service_client/api_proxy/service/RestoreSnapshot.h> using namespace chaos; using namespace chaos::metadata_service_client::api_proxy; diff --git a/ChaosMetadataServiceClient/api_proxy/service/RestoreSnapshot.h b/chaos_metadata_service_client/api_proxy/service/RestoreSnapshot.h similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/service/RestoreSnapshot.h rename to chaos_metadata_service_client/api_proxy/service/RestoreSnapshot.h index d6fd17e10..9d814064f 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/RestoreSnapshot.h +++ b/chaos_metadata_service_client/api_proxy/service/RestoreSnapshot.h @@ -22,7 +22,7 @@ #ifndef __MetadataServiceClient__RestoreSnapshot_h #define __MetadataServiceClient__RestoreSnapshot_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/service/SetSnapshotDatasetsForNode.cpp b/chaos_metadata_service_client/api_proxy/service/SetSnapshotDatasetsForNode.cpp similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/service/SetSnapshotDatasetsForNode.cpp rename to chaos_metadata_service_client/api_proxy/service/SetSnapshotDatasetsForNode.cpp index 35143d350..31bf4ed6c 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/SetSnapshotDatasetsForNode.cpp +++ b/chaos_metadata_service_client/api_proxy/service/SetSnapshotDatasetsForNode.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/service/SetSnapshotDatasetsForNode.h> +#include <chaos_metadata_service_client/api_proxy/service/SetSnapshotDatasetsForNode.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/service/SetSnapshotDatasetsForNode.h b/chaos_metadata_service_client/api_proxy/service/SetSnapshotDatasetsForNode.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/service/SetSnapshotDatasetsForNode.h rename to chaos_metadata_service_client/api_proxy/service/SetSnapshotDatasetsForNode.h index f1348ce59..290248881 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/SetSnapshotDatasetsForNode.h +++ b/chaos_metadata_service_client/api_proxy/service/SetSnapshotDatasetsForNode.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__5B48DE9_CCDA_4A6C_942B_988EE60EB694_SetSnapshotDatasetsForNode_h #define __CHAOSFramework__5B48DE9_CCDA_4A6C_942B_988EE60EB694_SetSnapshotDatasetsForNode_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/service/SetVariable.cpp b/chaos_metadata_service_client/api_proxy/service/SetVariable.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/service/SetVariable.cpp rename to chaos_metadata_service_client/api_proxy/service/SetVariable.cpp index 4e111da18..b25a368d3 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/SetVariable.cpp +++ b/chaos_metadata_service_client/api_proxy/service/SetVariable.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/service/SetVariable.h> +#include <chaos_metadata_service_client/api_proxy/service/SetVariable.h> using namespace chaos; using namespace chaos::common::data; diff --git a/ChaosMetadataServiceClient/api_proxy/service/SetVariable.h b/chaos_metadata_service_client/api_proxy/service/SetVariable.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/service/SetVariable.h rename to chaos_metadata_service_client/api_proxy/service/SetVariable.h index cd26a8e9b..43d60b851 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/SetVariable.h +++ b/chaos_metadata_service_client/api_proxy/service/SetVariable.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__761BB38_EF90_4EAE_8286_BB04C12F46E7_SetVariable_h #define __CHAOSFramework__761BB38_EF90_4EAE_8286_BB04C12F46E7_SetVariable_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> #include <chaos/common/chaos_types.h> diff --git a/ChaosMetadataServiceClient/api_proxy/service/service.h b/chaos_metadata_service_client/api_proxy/service/service.h similarity index 55% rename from ChaosMetadataServiceClient/api_proxy/service/service.h rename to chaos_metadata_service_client/api_proxy/service/service.h index f6fe809a9..143bc2315 100644 --- a/ChaosMetadataServiceClient/api_proxy/service/service.h +++ b/chaos_metadata_service_client/api_proxy/service/service.h @@ -22,16 +22,16 @@ #ifndef __CHAOSFramework__FAF6B9C_755D_4F4B_9951_29252A834468_service_h #define __CHAOSFramework__FAF6B9C_755D_4F4B_9951_29252A834468_service_h -#include <ChaosMetadataServiceClient/api_proxy/service/ResetAll.h> -#include <ChaosMetadataServiceClient/api_proxy/service/GetAllSnapshot.h> -#include <ChaosMetadataServiceClient/api_proxy/service/DeleteSnapshot.h> -#include <ChaosMetadataServiceClient/api_proxy/service/RestoreSnapshot.h> -#include <ChaosMetadataServiceClient/api_proxy/service/CreateNewSnapshot.h> -#include <ChaosMetadataServiceClient/api_proxy/service/GetNodesForSnapshot.h> -#include <ChaosMetadataServiceClient/api_proxy/service/GetSnapshotDatasetForNode.h> +#include <chaos_metadata_service_client/api_proxy/service/ResetAll.h> +#include <chaos_metadata_service_client/api_proxy/service/GetAllSnapshot.h> +#include <chaos_metadata_service_client/api_proxy/service/DeleteSnapshot.h> +#include <chaos_metadata_service_client/api_proxy/service/RestoreSnapshot.h> +#include <chaos_metadata_service_client/api_proxy/service/CreateNewSnapshot.h> +#include <chaos_metadata_service_client/api_proxy/service/GetNodesForSnapshot.h> +#include <chaos_metadata_service_client/api_proxy/service/GetSnapshotDatasetForNode.h> -#include <ChaosMetadataServiceClient/api_proxy/service/SetVariable.h> -#include <ChaosMetadataServiceClient/api_proxy/service/GetVariable.h> -#include <ChaosMetadataServiceClient/api_proxy/service/RemoveVariable.h> +#include <chaos_metadata_service_client/api_proxy/service/SetVariable.h> +#include <chaos_metadata_service_client/api_proxy/service/GetVariable.h> +#include <chaos_metadata_service_client/api_proxy/service/RemoveVariable.h> #endif /* __CHAOSFramework__FAF6B9C_755D_4F4B_9951_29252A834468_service_h */ diff --git a/ChaosMetadataServiceClient/api_proxy/unit_server/DeleteUS.cpp b/chaos_metadata_service_client/api_proxy/unit_server/DeleteUS.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/unit_server/DeleteUS.cpp rename to chaos_metadata_service_client/api_proxy/unit_server/DeleteUS.cpp index 5ee4c1f35..7002e33fe 100644 --- a/ChaosMetadataServiceClient/api_proxy/unit_server/DeleteUS.cpp +++ b/chaos_metadata_service_client/api_proxy/unit_server/DeleteUS.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/unit_server/DeleteUS.h> +#include <chaos_metadata_service_client/api_proxy/unit_server/DeleteUS.h> using namespace chaos::metadata_service_client::api_proxy; using namespace chaos::metadata_service_client::api_proxy::unit_server; diff --git a/ChaosMetadataServiceClient/api_proxy/unit_server/DeleteUS.h b/chaos_metadata_service_client/api_proxy/unit_server/DeleteUS.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/unit_server/DeleteUS.h rename to chaos_metadata_service_client/api_proxy/unit_server/DeleteUS.h index 8c0350e05..3f61c9d44 100644 --- a/ChaosMetadataServiceClient/api_proxy/unit_server/DeleteUS.h +++ b/chaos_metadata_service_client/api_proxy/unit_server/DeleteUS.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__DeleteUS__ #define __CHAOSFramework__DeleteUS__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/unit_server/GetDescription.cpp b/chaos_metadata_service_client/api_proxy/unit_server/GetDescription.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/unit_server/GetDescription.cpp rename to chaos_metadata_service_client/api_proxy/unit_server/GetDescription.cpp index eb25b16b7..905ab1652 100644 --- a/ChaosMetadataServiceClient/api_proxy/unit_server/GetDescription.cpp +++ b/chaos_metadata_service_client/api_proxy/unit_server/GetDescription.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/unit_server/GetDescription.h> +#include <chaos_metadata_service_client/api_proxy/unit_server/GetDescription.h> using namespace chaos::metadata_service_client::api_proxy; using namespace chaos::metadata_service_client::api_proxy::unit_server; diff --git a/ChaosMetadataServiceClient/api_proxy/unit_server/GetDescription.h b/chaos_metadata_service_client/api_proxy/unit_server/GetDescription.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/unit_server/GetDescription.h rename to chaos_metadata_service_client/api_proxy/unit_server/GetDescription.h index 697298ae2..1ece9d7c0 100644 --- a/ChaosMetadataServiceClient/api_proxy/unit_server/GetDescription.h +++ b/chaos_metadata_service_client/api_proxy/unit_server/GetDescription.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__GetDescription__ #define __CHAOSFramework__GetDescription__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/unit_server/GetSetFullUnitServer.cpp b/chaos_metadata_service_client/api_proxy/unit_server/GetSetFullUnitServer.cpp similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/unit_server/GetSetFullUnitServer.cpp rename to chaos_metadata_service_client/api_proxy/unit_server/GetSetFullUnitServer.cpp index 0995f4a4a..0e1428055 100644 --- a/ChaosMetadataServiceClient/api_proxy/unit_server/GetSetFullUnitServer.cpp +++ b/chaos_metadata_service_client/api_proxy/unit_server/GetSetFullUnitServer.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/unit_server/GetSetFullUnitServer.h> +#include <chaos_metadata_service_client/api_proxy/unit_server/GetSetFullUnitServer.h> #include "NewUS.h" using namespace chaos; using namespace chaos::metadata_service_client::api_proxy; diff --git a/ChaosMetadataServiceClient/api_proxy/unit_server/GetSetFullUnitServer.h b/chaos_metadata_service_client/api_proxy/unit_server/GetSetFullUnitServer.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/unit_server/GetSetFullUnitServer.h rename to chaos_metadata_service_client/api_proxy/unit_server/GetSetFullUnitServer.h index 2681632b0..20d6041b1 100644 --- a/ChaosMetadataServiceClient/api_proxy/unit_server/GetSetFullUnitServer.h +++ b/chaos_metadata_service_client/api_proxy/unit_server/GetSetFullUnitServer.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__GetSetFullUnitServer__ #define __CHAOSFramework__GetSetFullUnitServer__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/unit_server/LoadUnloadControlUnit.cpp b/chaos_metadata_service_client/api_proxy/unit_server/LoadUnloadControlUnit.cpp similarity index 94% rename from ChaosMetadataServiceClient/api_proxy/unit_server/LoadUnloadControlUnit.cpp rename to chaos_metadata_service_client/api_proxy/unit_server/LoadUnloadControlUnit.cpp index 6fe2be22a..b476f1bf2 100644 --- a/ChaosMetadataServiceClient/api_proxy/unit_server/LoadUnloadControlUnit.cpp +++ b/chaos_metadata_service_client/api_proxy/unit_server/LoadUnloadControlUnit.cpp @@ -18,7 +18,7 @@ * See the Licence for the specific language governing * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/unit_server/LoadUnloadControlUnit.h> +#include <chaos_metadata_service_client/api_proxy/unit_server/LoadUnloadControlUnit.h> using namespace chaos::metadata_service_client::api_proxy; using namespace chaos::metadata_service_client::api_proxy::unit_server; diff --git a/ChaosMetadataServiceClient/api_proxy/unit_server/LoadUnloadControlUnit.h b/chaos_metadata_service_client/api_proxy/unit_server/LoadUnloadControlUnit.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/unit_server/LoadUnloadControlUnit.h rename to chaos_metadata_service_client/api_proxy/unit_server/LoadUnloadControlUnit.h index 964caf394..708792ef5 100644 --- a/ChaosMetadataServiceClient/api_proxy/unit_server/LoadUnloadControlUnit.h +++ b/chaos_metadata_service_client/api_proxy/unit_server/LoadUnloadControlUnit.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__LoadUnloadControlUnit__ #define __CHAOSFramework__LoadUnloadControlUnit__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/unit_server/ManageCUType.cpp b/chaos_metadata_service_client/api_proxy/unit_server/ManageCUType.cpp similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/unit_server/ManageCUType.cpp rename to chaos_metadata_service_client/api_proxy/unit_server/ManageCUType.cpp index dd3fa49b2..5c5b1c058 100644 --- a/ChaosMetadataServiceClient/api_proxy/unit_server/ManageCUType.cpp +++ b/chaos_metadata_service_client/api_proxy/unit_server/ManageCUType.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/unit_server/ManageCUType.h> +#include <chaos_metadata_service_client/api_proxy/unit_server/ManageCUType.h> using namespace chaos; using namespace chaos::metadata_service_client::api_proxy; diff --git a/ChaosMetadataServiceClient/api_proxy/unit_server/ManageCUType.h b/chaos_metadata_service_client/api_proxy/unit_server/ManageCUType.h similarity index 97% rename from ChaosMetadataServiceClient/api_proxy/unit_server/ManageCUType.h rename to chaos_metadata_service_client/api_proxy/unit_server/ManageCUType.h index 8cc7c8f7a..211609e71 100644 --- a/ChaosMetadataServiceClient/api_proxy/unit_server/ManageCUType.h +++ b/chaos_metadata_service_client/api_proxy/unit_server/ManageCUType.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__ManageCUType__ #define __CHAOSFramework__ManageCUType__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/unit_server/NewUS.cpp b/chaos_metadata_service_client/api_proxy/unit_server/NewUS.cpp similarity index 95% rename from ChaosMetadataServiceClient/api_proxy/unit_server/NewUS.cpp rename to chaos_metadata_service_client/api_proxy/unit_server/NewUS.cpp index 4e9101160..cc52efc74 100644 --- a/ChaosMetadataServiceClient/api_proxy/unit_server/NewUS.cpp +++ b/chaos_metadata_service_client/api_proxy/unit_server/NewUS.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/api_proxy/unit_server/NewUS.h> +#include <chaos_metadata_service_client/api_proxy/unit_server/NewUS.h> using namespace chaos::metadata_service_client::api_proxy; using namespace chaos::metadata_service_client::api_proxy::unit_server; diff --git a/ChaosMetadataServiceClient/api_proxy/unit_server/NewUS.h b/chaos_metadata_service_client/api_proxy/unit_server/NewUS.h similarity index 96% rename from ChaosMetadataServiceClient/api_proxy/unit_server/NewUS.h rename to chaos_metadata_service_client/api_proxy/unit_server/NewUS.h index 81a3f0b38..637f41b1e 100644 --- a/ChaosMetadataServiceClient/api_proxy/unit_server/NewUS.h +++ b/chaos_metadata_service_client/api_proxy/unit_server/NewUS.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__NewUS__ #define __CHAOSFramework__NewUS__ -#include <ChaosMetadataServiceClient/api_proxy/ApiProxy.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxy.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/api_proxy/unit_server/unit_server.h b/chaos_metadata_service_client/api_proxy/unit_server/unit_server.h similarity index 74% rename from ChaosMetadataServiceClient/api_proxy/unit_server/unit_server.h rename to chaos_metadata_service_client/api_proxy/unit_server/unit_server.h index f5d7710ac..68265609e 100644 --- a/ChaosMetadataServiceClient/api_proxy/unit_server/unit_server.h +++ b/chaos_metadata_service_client/api_proxy/unit_server/unit_server.h @@ -22,9 +22,9 @@ #ifndef __CHAOSFramework__F5336BE_7277_4C86_A1EB_14BD07E559CC_unit_server_h #define __CHAOSFramework__F5336BE_7277_4C86_A1EB_14BD07E559CC_unit_server_h -#include <ChaosMetadataServiceClient/api_proxy/unit_server/NewUS.h> -#include <ChaosMetadataServiceClient/api_proxy/unit_server/ManageCUType.h> -#include <ChaosMetadataServiceClient/api_proxy/unit_server/GetDescription.h> -#include <ChaosMetadataServiceClient/api_proxy/unit_server/LoadUnloadControlUnit.h> +#include <chaos_metadata_service_client/api_proxy/unit_server/NewUS.h> +#include <chaos_metadata_service_client/api_proxy/unit_server/ManageCUType.h> +#include <chaos_metadata_service_client/api_proxy/unit_server/GetDescription.h> +#include <chaos_metadata_service_client/api_proxy/unit_server/LoadUnloadControlUnit.h> #endif /* __CHAOSFramework__F5336BE_7277_4C86_A1EB_14BD07E559CC_unit_server_h */ diff --git a/ChaosMetadataServiceClient/event/AbstractEventHandler.cpp b/chaos_metadata_service_client/event/AbstractEventHandler.cpp similarity index 94% rename from ChaosMetadataServiceClient/event/AbstractEventHandler.cpp rename to chaos_metadata_service_client/event/AbstractEventHandler.cpp index f57be13a8..e2727ae2a 100644 --- a/ChaosMetadataServiceClient/event/AbstractEventHandler.cpp +++ b/chaos_metadata_service_client/event/AbstractEventHandler.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/event/AbstractEventHandler.h> +#include <chaos_metadata_service_client/event/AbstractEventHandler.h> using namespace chaos::common::event; @@ -39,4 +39,4 @@ const EventType& AbstractEventHandler::getType() { const unsigned int AbstractEventHandler::getSubType() { return subtype; -} \ No newline at end of file +} diff --git a/ChaosMetadataServiceClient/event/AbstractEventHandler.h b/chaos_metadata_service_client/event/AbstractEventHandler.h similarity index 100% rename from ChaosMetadataServiceClient/event/AbstractEventHandler.h rename to chaos_metadata_service_client/event/AbstractEventHandler.h diff --git a/ChaosMetadataServiceClient/event/EventDispatchManager.cpp b/chaos_metadata_service_client/event/EventDispatchManager.cpp similarity index 93% rename from ChaosMetadataServiceClient/event/EventDispatchManager.cpp rename to chaos_metadata_service_client/event/EventDispatchManager.cpp index 5e2da0b68..55222fa64 100644 --- a/ChaosMetadataServiceClient/event/EventDispatchManager.cpp +++ b/chaos_metadata_service_client/event/EventDispatchManager.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/event/EventDispatchManager.h> +#include <chaos_metadata_service_client/event/EventDispatchManager.h> #include <chaos/common/network/NetworkBroker.h> @@ -29,14 +29,14 @@ using namespace chaos::metadata_service_client::event; -//! default private constructor called only by ChaosMetadataServiceClient class +//! default private constructor called only by chaos_metadata_service_client class EventDispatchManager::EventDispatchManager(ClientSetting *_setting): setting(_setting), alert_event_channel(NULL) { } -//! default destructor called only by ChaosMetadataServiceClient class +//! default destructor called only by chaos_metadata_service_client class EventDispatchManager::~EventDispatchManager() { } diff --git a/ChaosMetadataServiceClient/event/EventDispatchManager.h b/chaos_metadata_service_client/event/EventDispatchManager.h similarity index 95% rename from ChaosMetadataServiceClient/event/EventDispatchManager.h rename to chaos_metadata_service_client/event/EventDispatchManager.h index 02431c2be..be0af4ef3 100644 --- a/ChaosMetadataServiceClient/event/EventDispatchManager.h +++ b/chaos_metadata_service_client/event/EventDispatchManager.h @@ -23,8 +23,8 @@ #define __CHAOSFramework__EventDispatchManager_h -#include <ChaosMetadataServiceClient/event/AbstractEventHandler.h> -#include <ChaosMetadataServiceClient/metadata_service_client_types.h> +#include <chaos_metadata_service_client/event/AbstractEventHandler.h> +#include <chaos_metadata_service_client/metadata_service_client_types.h> #include <chaos/common/chaos_types.h> #include <chaos/common/event/event.h> diff --git a/ChaosMetadataServiceClient/event/alert/AlertAgentCheckProcessHandler.cpp b/chaos_metadata_service_client/event/alert/AlertAgentCheckProcessHandler.cpp similarity index 94% rename from ChaosMetadataServiceClient/event/alert/AlertAgentCheckProcessHandler.cpp rename to chaos_metadata_service_client/event/alert/AlertAgentCheckProcessHandler.cpp index a60bb42d6..347141ea2 100644 --- a/ChaosMetadataServiceClient/event/alert/AlertAgentCheckProcessHandler.cpp +++ b/chaos_metadata_service_client/event/alert/AlertAgentCheckProcessHandler.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/event/alert/AlertAgentCheckProcessHandler.h> +#include <chaos_metadata_service_client/event/alert/AlertAgentCheckProcessHandler.h> using namespace chaos::common::event; using namespace chaos::common::event::alert; diff --git a/ChaosMetadataServiceClient/event/alert/AlertAgentCheckProcessHandler.h b/chaos_metadata_service_client/event/alert/AlertAgentCheckProcessHandler.h similarity index 95% rename from ChaosMetadataServiceClient/event/alert/AlertAgentCheckProcessHandler.h rename to chaos_metadata_service_client/event/alert/AlertAgentCheckProcessHandler.h index c689f24e9..c9c148503 100644 --- a/ChaosMetadataServiceClient/event/alert/AlertAgentCheckProcessHandler.h +++ b/chaos_metadata_service_client/event/alert/AlertAgentCheckProcessHandler.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__CD6CD4D_61F0_4997_83B6_352E72DEFD00_AlertAgentCheckProcessHandler_h #define __CHAOSFramework__CD6CD4D_61F0_4997_83B6_352E72DEFD00_AlertAgentCheckProcessHandler_h -#include <ChaosMetadataServiceClient/event/alert/AlertEventHandler.h> +#include <chaos_metadata_service_client/event/alert/AlertEventHandler.h> #include <chaos/common/event/event.h> diff --git a/ChaosMetadataServiceClient/event/alert/AlertEventHandler.cpp b/chaos_metadata_service_client/event/alert/AlertEventHandler.cpp similarity index 93% rename from ChaosMetadataServiceClient/event/alert/AlertEventHandler.cpp rename to chaos_metadata_service_client/event/alert/AlertEventHandler.cpp index 511984d34..e8419ee8f 100644 --- a/ChaosMetadataServiceClient/event/alert/AlertEventHandler.cpp +++ b/chaos_metadata_service_client/event/alert/AlertEventHandler.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/event/alert/AlertEventHandler.h> +#include <chaos_metadata_service_client/event/alert/AlertEventHandler.h> using namespace chaos::common::event; using namespace chaos::common::event::alert; diff --git a/ChaosMetadataServiceClient/event/alert/AlertEventHandler.h b/chaos_metadata_service_client/event/alert/AlertEventHandler.h similarity index 94% rename from ChaosMetadataServiceClient/event/alert/AlertEventHandler.h rename to chaos_metadata_service_client/event/alert/AlertEventHandler.h index 0569d8820..ff7e75376 100644 --- a/ChaosMetadataServiceClient/event/alert/AlertEventHandler.h +++ b/chaos_metadata_service_client/event/alert/AlertEventHandler.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__AlertEventHandler_h #define __CHAOSFramework__AlertEventHandler_h -#include <ChaosMetadataServiceClient/event/AbstractEventHandler.h> +#include <chaos_metadata_service_client/event/AbstractEventHandler.h> namespace chaos { diff --git a/ChaosMetadataServiceClient/event/alert/AlertLogEventHandler.cpp b/chaos_metadata_service_client/event/alert/AlertLogEventHandler.cpp similarity index 94% rename from ChaosMetadataServiceClient/event/alert/AlertLogEventHandler.cpp rename to chaos_metadata_service_client/event/alert/AlertLogEventHandler.cpp index 2d174729a..b2ab00096 100644 --- a/ChaosMetadataServiceClient/event/alert/AlertLogEventHandler.cpp +++ b/chaos_metadata_service_client/event/alert/AlertLogEventHandler.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/event/alert/AlertLogEventHandler.h> +#include <chaos_metadata_service_client/event/alert/AlertLogEventHandler.h> using namespace chaos::common::event; using namespace chaos::common::event::alert; @@ -43,4 +43,4 @@ void AlertLogEventHandler::handleEvent(const EventDescriptor * const event) { handleLogEvent(node_uid, log_domian); -} \ No newline at end of file +} diff --git a/ChaosMetadataServiceClient/event/alert/AlertLogEventHandler.h b/chaos_metadata_service_client/event/alert/AlertLogEventHandler.h similarity index 95% rename from ChaosMetadataServiceClient/event/alert/AlertLogEventHandler.h rename to chaos_metadata_service_client/event/alert/AlertLogEventHandler.h index 6c8319b4f..3aa48110f 100644 --- a/ChaosMetadataServiceClient/event/alert/AlertLogEventHandler.h +++ b/chaos_metadata_service_client/event/alert/AlertLogEventHandler.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__AlertLogEventHandler_h #define __CHAOSFramework__AlertLogEventHandler_h -#include <ChaosMetadataServiceClient/event/alert/AlertEventHandler.h> +#include <chaos_metadata_service_client/event/alert/AlertEventHandler.h> #include <chaos/common/event/event.h> diff --git a/ChaosMetadataServiceClient/event/event.h b/chaos_metadata_service_client/event/event.h similarity index 70% rename from ChaosMetadataServiceClient/event/event.h rename to chaos_metadata_service_client/event/event.h index bd4581fe7..afeca5ea7 100644 --- a/ChaosMetadataServiceClient/event/event.h +++ b/chaos_metadata_service_client/event/event.h @@ -22,10 +22,10 @@ #ifndef __CHAOSFramework__MetadataService__event_h #define __CHAOSFramework__MetadataService__event_h -#include <ChaosMetadataServiceClient/event/EventDispatchManager.h> -#include <ChaosMetadataServiceClient/event/AbstractEventHandler.h> -#include <ChaosMetadataServiceClient/event/alert/AlertEventHandler.h> -#include <ChaosMetadataServiceClient/event/alert/AlertLogEventHandler.h> -#include <ChaosMetadataServiceClient/event/alert/AlertAgentCheckProcessHandler.h> +#include <chaos_metadata_service_client/event/EventDispatchManager.h> +#include <chaos_metadata_service_client/event/AbstractEventHandler.h> +#include <chaos_metadata_service_client/event/alert/AlertEventHandler.h> +#include <chaos_metadata_service_client/event/alert/AlertLogEventHandler.h> +#include <chaos_metadata_service_client/event/alert/AlertAgentCheckProcessHandler.h> #endif /* __CHAOSFramework__event_h */ diff --git a/ChaosMetadataServiceClient/metadata_service_client_constants.h b/chaos_metadata_service_client/metadata_service_client_constants.h similarity index 100% rename from ChaosMetadataServiceClient/metadata_service_client_constants.h rename to chaos_metadata_service_client/metadata_service_client_constants.h diff --git a/ChaosMetadataServiceClient/metadata_service_client_types.h b/chaos_metadata_service_client/metadata_service_client_types.h similarity index 100% rename from ChaosMetadataServiceClient/metadata_service_client_types.h rename to chaos_metadata_service_client/metadata_service_client_types.h diff --git a/ChaosMetadataServiceClient/monitor_system/AbstractQuantumKeyAttributeHandler.cpp b/chaos_metadata_service_client/monitor_system/AbstractQuantumKeyAttributeHandler.cpp similarity index 97% rename from ChaosMetadataServiceClient/monitor_system/AbstractQuantumKeyAttributeHandler.cpp rename to chaos_metadata_service_client/monitor_system/AbstractQuantumKeyAttributeHandler.cpp index c79f74ff0..6b0563d63 100644 --- a/ChaosMetadataServiceClient/monitor_system/AbstractQuantumKeyAttributeHandler.cpp +++ b/chaos_metadata_service_client/monitor_system/AbstractQuantumKeyAttributeHandler.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/monitor_system/AbstractQuantumKeyAttributeHandler.h> +#include <chaos_metadata_service_client/monitor_system/AbstractQuantumKeyAttributeHandler.h> using namespace chaos::common::data; using namespace chaos::metadata_service_client::monitor_system; diff --git a/ChaosMetadataServiceClient/monitor_system/AbstractQuantumKeyAttributeHandler.h b/chaos_metadata_service_client/monitor_system/AbstractQuantumKeyAttributeHandler.h similarity index 99% rename from ChaosMetadataServiceClient/monitor_system/AbstractQuantumKeyAttributeHandler.h rename to chaos_metadata_service_client/monitor_system/AbstractQuantumKeyAttributeHandler.h index d0162ffa5..17b858f8a 100644 --- a/ChaosMetadataServiceClient/monitor_system/AbstractQuantumKeyAttributeHandler.h +++ b/chaos_metadata_service_client/monitor_system/AbstractQuantumKeyAttributeHandler.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__AbstractQuantumKeyAttributeHandler__ #define __CHAOSFramework__AbstractQuantumKeyAttributeHandler__ -#include <ChaosMetadataServiceClient/monitor_system/monitor_system_types.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system_types.h> #include <chaos/common/data/CDataWrapper.h> diff --git a/ChaosMetadataServiceClient/monitor_system/MonitorManager.cpp b/chaos_metadata_service_client/monitor_system/MonitorManager.cpp similarity index 99% rename from ChaosMetadataServiceClient/monitor_system/MonitorManager.cpp rename to chaos_metadata_service_client/monitor_system/MonitorManager.cpp index abac72510..2ab8b21a0 100644 --- a/ChaosMetadataServiceClient/monitor_system/MonitorManager.cpp +++ b/chaos_metadata_service_client/monitor_system/MonitorManager.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/monitor_system/MonitorManager.h> +#include <chaos_metadata_service_client/monitor_system/MonitorManager.h> using namespace chaos::common::async_central; using namespace chaos::metadata_service_client::monitor_system; diff --git a/ChaosMetadataServiceClient/monitor_system/MonitorManager.h b/chaos_metadata_service_client/monitor_system/MonitorManager.h similarity index 95% rename from ChaosMetadataServiceClient/monitor_system/MonitorManager.h rename to chaos_metadata_service_client/monitor_system/MonitorManager.h index caa002b98..ba7c692b9 100644 --- a/ChaosMetadataServiceClient/monitor_system/MonitorManager.h +++ b/chaos_metadata_service_client/monitor_system/MonitorManager.h @@ -22,10 +22,10 @@ #ifndef __CHAOSFramework__MonitorManager__ #define __CHAOSFramework__MonitorManager__ -#include <ChaosMetadataServiceClient/metadata_service_client_types.h> -#include <ChaosMetadataServiceClient/monitor_system/monitor_system_types.h> -#include <ChaosMetadataServiceClient/monitor_system/QuantumSlotScheduler.h> -#include <ChaosMetadataServiceClient/monitor_system/QuantumKeyConsumer.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system_types.h> +#include <chaos_metadata_service_client/monitor_system/QuantumSlotScheduler.h> +#include <chaos_metadata_service_client/monitor_system/QuantumKeyConsumer.h> +#include <chaos_metadata_service_client/metadata_service_client_types.h> #include <chaos/common/chaos_types.h> #include <chaos/common/network/NetworkBroker.h> diff --git a/ChaosMetadataServiceClient/monitor_system/QuantumKeyConsumer.cpp b/chaos_metadata_service_client/monitor_system/QuantumKeyConsumer.cpp similarity index 100% rename from ChaosMetadataServiceClient/monitor_system/QuantumKeyConsumer.cpp rename to chaos_metadata_service_client/monitor_system/QuantumKeyConsumer.cpp diff --git a/ChaosMetadataServiceClient/monitor_system/QuantumKeyConsumer.h b/chaos_metadata_service_client/monitor_system/QuantumKeyConsumer.h similarity index 93% rename from ChaosMetadataServiceClient/monitor_system/QuantumKeyConsumer.h rename to chaos_metadata_service_client/monitor_system/QuantumKeyConsumer.h index cfe874c7e..f2d61602a 100644 --- a/ChaosMetadataServiceClient/monitor_system/QuantumKeyConsumer.h +++ b/chaos_metadata_service_client/monitor_system/QuantumKeyConsumer.h @@ -23,8 +23,8 @@ #define __CHAOSFramework__QuantumTypedConsumer__ #include <chaos/common/global.h> -#include <ChaosMetadataServiceClient/monitor_system/monitor_system_types.h> -#include <ChaosMetadataServiceClient/monitor_system/AbstractQuantumKeyAttributeHandler.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system_types.h> +#include <chaos_metadata_service_client/monitor_system/AbstractQuantumKeyAttributeHandler.h> #include <boost/thread.hpp> diff --git a/ChaosMetadataServiceClient/monitor_system/QuantumSlot.cpp b/chaos_metadata_service_client/monitor_system/QuantumSlot.cpp similarity index 98% rename from ChaosMetadataServiceClient/monitor_system/QuantumSlot.cpp rename to chaos_metadata_service_client/monitor_system/QuantumSlot.cpp index c4ba812d3..2c7d7b036 100644 --- a/ChaosMetadataServiceClient/monitor_system/QuantumSlot.cpp +++ b/chaos_metadata_service_client/monitor_system/QuantumSlot.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/monitor_system/QuantumSlot.h> +#include <chaos_metadata_service_client/monitor_system/QuantumSlot.h> #include <chaos/common/utility/TimingUtil.h> diff --git a/ChaosMetadataServiceClient/monitor_system/QuantumSlot.h b/chaos_metadata_service_client/monitor_system/QuantumSlot.h similarity index 98% rename from ChaosMetadataServiceClient/monitor_system/QuantumSlot.h rename to chaos_metadata_service_client/monitor_system/QuantumSlot.h index 85cde067e..e58471d6f 100644 --- a/ChaosMetadataServiceClient/monitor_system/QuantumSlot.h +++ b/chaos_metadata_service_client/monitor_system/QuantumSlot.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__QuantumSlot__ #define __CHAOSFramework__QuantumSlot__ -#include <ChaosMetadataServiceClient/monitor_system/monitor_system_types.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system_types.h> #include <boost/multi_index_container.hpp> #include <boost/multi_index/member.hpp> diff --git a/ChaosMetadataServiceClient/monitor_system/QuantumSlotScheduler.cpp b/chaos_metadata_service_client/monitor_system/QuantumSlotScheduler.cpp similarity index 99% rename from ChaosMetadataServiceClient/monitor_system/QuantumSlotScheduler.cpp rename to chaos_metadata_service_client/monitor_system/QuantumSlotScheduler.cpp index 078716718..ac749d5a2 100644 --- a/ChaosMetadataServiceClient/monitor_system/QuantumSlotScheduler.cpp +++ b/chaos_metadata_service_client/monitor_system/QuantumSlotScheduler.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/monitor_system/QuantumSlotScheduler.h> +#include <chaos_metadata_service_client/monitor_system/QuantumSlotScheduler.h> #include <chaos/common/io/IODirectIODriver.h> #include <chaos/common/utility/TimingUtil.h> diff --git a/ChaosMetadataServiceClient/monitor_system/QuantumSlotScheduler.h b/chaos_metadata_service_client/monitor_system/QuantumSlotScheduler.h similarity index 98% rename from ChaosMetadataServiceClient/monitor_system/QuantumSlotScheduler.h rename to chaos_metadata_service_client/monitor_system/QuantumSlotScheduler.h index 24bd5b2f6..3a51c250c 100644 --- a/ChaosMetadataServiceClient/monitor_system/QuantumSlotScheduler.h +++ b/chaos_metadata_service_client/monitor_system/QuantumSlotScheduler.h @@ -22,8 +22,8 @@ #ifndef __CHAOSFramework__QuantumSlotScheduler__ #define __CHAOSFramework__QuantumSlotScheduler__ -#include <ChaosMetadataServiceClient/monitor_system/monitor_system_types.h> -#include <ChaosMetadataServiceClient/monitor_system/QuantumSlot.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system_types.h> +#include <chaos_metadata_service_client/monitor_system/QuantumSlot.h> #include <chaos/common/chaos_types.h> #include <chaos/common/io/IODataDriver.h> diff --git a/ChaosMetadataServiceClient/monitor_system/QuantumTSTaggedAttributeHandler.cpp b/chaos_metadata_service_client/monitor_system/QuantumTSTaggedAttributeHandler.cpp similarity index 97% rename from ChaosMetadataServiceClient/monitor_system/QuantumTSTaggedAttributeHandler.cpp rename to chaos_metadata_service_client/monitor_system/QuantumTSTaggedAttributeHandler.cpp index 9922ec857..ed0ad92dc 100644 --- a/ChaosMetadataServiceClient/monitor_system/QuantumTSTaggedAttributeHandler.cpp +++ b/chaos_metadata_service_client/monitor_system/QuantumTSTaggedAttributeHandler.cpp @@ -20,7 +20,7 @@ */ -#include <ChaosMetadataServiceClient/monitor_system/QuantumTSTaggedAttributeHandler.h> +#include <chaos_metadata_service_client/monitor_system/QuantumTSTaggedAttributeHandler.h> using namespace chaos::common::data; using namespace chaos::metadata_service_client::monitor_system; diff --git a/ChaosMetadataServiceClient/monitor_system/QuantumTSTaggedAttributeHandler.h b/chaos_metadata_service_client/monitor_system/QuantumTSTaggedAttributeHandler.h similarity index 97% rename from ChaosMetadataServiceClient/monitor_system/QuantumTSTaggedAttributeHandler.h rename to chaos_metadata_service_client/monitor_system/QuantumTSTaggedAttributeHandler.h index 49c3fb9ae..cdbebfb2d 100644 --- a/ChaosMetadataServiceClient/monitor_system/QuantumTSTaggedAttributeHandler.h +++ b/chaos_metadata_service_client/monitor_system/QuantumTSTaggedAttributeHandler.h @@ -22,8 +22,8 @@ #ifndef __CHAOSFramework__QuantumTSTaggedAttributeHandler__ #define __CHAOSFramework__QuantumTSTaggedAttributeHandler__ -#include <ChaosMetadataServiceClient/monitor_system/monitor_system_types.h> -#include <ChaosMetadataServiceClient/monitor_system/AbstractQuantumKeyAttributeHandler.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system_types.h> +#include <chaos_metadata_service_client/monitor_system/AbstractQuantumKeyAttributeHandler.h> #include <chaos/common/data/CDataWrapper.h> diff --git a/ChaosMetadataServiceClient/monitor_system/handler/HealtHeartbeatAttributeHandler.h b/chaos_metadata_service_client/monitor_system/handler/HealtHeartbeatAttributeHandler.h similarity index 94% rename from ChaosMetadataServiceClient/monitor_system/handler/HealtHeartbeatAttributeHandler.h rename to chaos_metadata_service_client/monitor_system/handler/HealtHeartbeatAttributeHandler.h index 4dcb9acac..9b1f82302 100644 --- a/ChaosMetadataServiceClient/monitor_system/handler/HealtHeartbeatAttributeHandler.h +++ b/chaos_metadata_service_client/monitor_system/handler/HealtHeartbeatAttributeHandler.h @@ -22,7 +22,7 @@ #define CHAOSFramework_HealtHeartbeatAttributeHandler_h #include <chaos/common/chaos_constants.h> -#include <ChaosMetadataServiceClient/monitor_system/AbstractQuantumKeyAttributeHandler.h> +#include <chaos_metadata_service_client/monitor_system/AbstractQuantumKeyAttributeHandler.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/monitor_system/handler/HealtStatusAttributeHandler.h b/chaos_metadata_service_client/monitor_system/handler/HealtStatusAttributeHandler.h similarity index 94% rename from ChaosMetadataServiceClient/monitor_system/handler/HealtStatusAttributeHandler.h rename to chaos_metadata_service_client/monitor_system/handler/HealtStatusAttributeHandler.h index 8c8630c74..ade34ba06 100644 --- a/ChaosMetadataServiceClient/monitor_system/handler/HealtStatusAttributeHandler.h +++ b/chaos_metadata_service_client/monitor_system/handler/HealtStatusAttributeHandler.h @@ -23,7 +23,7 @@ #define __CHAOSFramework__HealtStatusAttributeHandler__ #include <chaos/common/chaos_constants.h> -#include <ChaosMetadataServiceClient/monitor_system/AbstractQuantumKeyAttributeHandler.h> +#include <chaos_metadata_service_client/monitor_system/AbstractQuantumKeyAttributeHandler.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/monitor_system/monitor_system.h b/chaos_metadata_service_client/monitor_system/monitor_system.h similarity index 51% rename from ChaosMetadataServiceClient/monitor_system/monitor_system.h rename to chaos_metadata_service_client/monitor_system/monitor_system.h index 0170bf276..d020b177f 100644 --- a/ChaosMetadataServiceClient/monitor_system/monitor_system.h +++ b/chaos_metadata_service_client/monitor_system/monitor_system.h @@ -21,15 +21,15 @@ #ifndef CHAOSFramework_monitor_system_h #define CHAOSFramework_monitor_system_h -#include <ChaosMetadataServiceClient/monitor_system/MonitorManager.h> -#include <ChaosMetadataServiceClient/monitor_system/monitor_system_types.h> +#include <chaos_metadata_service_client/monitor_system/MonitorManager.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system_types.h> -#include <ChaosMetadataServiceClient/monitor_system/QuantumSlot.h> -#include <ChaosMetadataServiceClient/monitor_system/MonitorManager.h> -#include <ChaosMetadataServiceClient/monitor_system/QuantumKeyConsumer.h> -#include <ChaosMetadataServiceClient/monitor_system/AbstractQuantumKeyAttributeHandler.h> -#include <ChaosMetadataServiceClient/monitor_system/QuantumTSTaggedAttributeHandler.h> +#include <chaos_metadata_service_client/monitor_system/QuantumSlot.h> +#include <chaos_metadata_service_client/monitor_system/MonitorManager.h> +#include <chaos_metadata_service_client/monitor_system/QuantumKeyConsumer.h> +#include <chaos_metadata_service_client/monitor_system/AbstractQuantumKeyAttributeHandler.h> +#include <chaos_metadata_service_client/monitor_system/QuantumTSTaggedAttributeHandler.h> -#include <ChaosMetadataServiceClient/monitor_system/handler/HealtStatusAttributeHandler.h> -#include <ChaosMetadataServiceClient/monitor_system/handler/HealtHeartbeatAttributeHandler.h> +#include <chaos_metadata_service_client/monitor_system/handler/HealtStatusAttributeHandler.h> +#include <chaos_metadata_service_client/monitor_system/handler/HealtHeartbeatAttributeHandler.h> #endif diff --git a/ChaosMetadataServiceClient/monitor_system/monitor_system_types.h b/chaos_metadata_service_client/monitor_system/monitor_system_types.h similarity index 100% rename from ChaosMetadataServiceClient/monitor_system/monitor_system_types.h rename to chaos_metadata_service_client/monitor_system/monitor_system_types.h diff --git a/ChaosMetadataServiceClient/node_controller/CUController.cpp b/chaos_metadata_service_client/node_controller/CUController.cpp similarity index 88% rename from ChaosMetadataServiceClient/node_controller/CUController.cpp rename to chaos_metadata_service_client/node_controller/CUController.cpp index 54208f687..ea43a82b7 100644 --- a/ChaosMetadataServiceClient/node_controller/CUController.cpp +++ b/chaos_metadata_service_client/node_controller/CUController.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/node_controller/CUController.h> +#include <chaos_metadata_service_client/node_controller/CUController.h> #include <chaos/common/chaos_constants.h> #include <chaos/common/data/CDataWrapper.h> #include <chaos/common/network/NetworkBroker.h> @@ -38,8 +38,8 @@ using namespace chaos::common::batch_command; using namespace chaos::cu::data_manager; -//--------------------------------------------------------------------------------------------------- -CUController::CUController(const std::string& _deviceID, chaos::common::io::ioDataDriver_shr _ioLiveDataDriver): +CUController::CUController(const std::string& _deviceID, + chaos::common::io::IODataDriverShrdPtr _ioLiveDataDriver): datasetDB(true), mdsChannel(NULL), deviceChannel(NULL) { @@ -88,7 +88,6 @@ deviceChannel(NULL) { updateChannel(); } -//--------------------------------------------------------------------------------------------------- CUController::~CUController() { LDBG_<<"["<<__PRETTY_FUNCTION__<<"] remove Device Controller:"<<deviceChannel->getDeviceID(); stopTracking(); @@ -108,17 +107,14 @@ CUController::~CUController() { } -//--------------------------------------------------------------------------------------------------- void CUController::setRequestTimeWaith(uint32_t newMillisecToWait){ millisecToWait = newMillisecToWait; } -//--------------------------------------------------------------------------------------------------- uint32_t CUController::getRequestTimeWaith(){ return millisecToWait; } -//--------------------------------------------------------------------------------------------------- void CUController::getDeviceId(string& dId) { dId = deviceChannel->getDeviceID(); } @@ -130,7 +126,6 @@ void CUController::deviceAvailabilityChanged(const std::string& device_id, } } -//--------------------------------------------------------------------------------------------------- void CUController::updateChannel() throw(CException) { CHAOS_ASSERT(deviceChannel); int err = ErrorCode::EC_NO_ERROR; @@ -151,37 +146,30 @@ void CUController::updateChannel() throw(CException) { datasetDB.addAttributeToDataSetFromDataWrapper(*lastDeviceDefinition.get()); } -//--------------------------------------------------------------------------------------------------- int CUController::setScheduleDelay(uint64_t microseconds) { CHAOS_ASSERT(deviceChannel) return deviceChannel->setScheduleDelay(microseconds, millisecToWait); } -//--------------------------------------------------------------------------------------------------- void CUController::getDeviceDatasetAttributesName(vector<string>& attributesName) { datasetDB.getDatasetAttributesName(attributesName); } -//--------------------------------------------------------------------------------------------------- void CUController::getAttributeDescription(const string& attributesName, string& attributeDescription) { datasetDB.getAttributeDescription(attributesName, attributeDescription); } -//--------------------------------------------------------------------------------------------------- void CUController::getDeviceDatasetAttributesName(vector<string>& attributesName, DataType::DataSetAttributeIOAttribute directionType) { datasetDB.getDatasetAttributesName(directionType, attributesName); } -//--------------------------------------------------------------------------------------------------- void CUController::getDeviceAttributeRangeValueInfo(const string& attributesName, chaos::common::data::RangeValueInfo& rangeInfo) { datasetDB.getAttributeRangeValueInfo(attributesName, rangeInfo); } -//--------------------------------------------------------------------------------------------------- int CUController::getDeviceAttributeDirection(const string& attributesName, DataType::DataSetAttributeIOAttribute& directionType) { return datasetDB.getAttributeDirection(attributesName, directionType); } -//--------------------------------------------------------------------------------------------------- int CUController::getAttributeStrValue(string attribute_name, string& attribute_value) { int err = 0; CDataWrapper * dataWrapper = getLiveCDataWrapperPtr(); @@ -228,7 +216,6 @@ int CUController::getAttributeStrValue(string attribute_name, string& attribute_ } return err; } -//--------------------------------------------------------------------------------------------------- int CUController::getDeviceAttributeType(const string& attr, DataType::DataType& type) { int err = 0; if(attributeValueMap.count(attr)){ @@ -239,7 +226,6 @@ int CUController::getDeviceAttributeType(const string& attr, DataType::DataType& return err; } -//--------------------------------------------------------------------------------------------------- int CUController::getType(std::string& control_unit_type) { int err = 0; if(cu_type.empty()) { @@ -257,7 +243,6 @@ int CUController::getType(std::string& control_unit_type) { return err; } -//--------------------------------------------------------------------------------------------------- int CUController::initDevice() { CHAOS_ASSERT(mdsChannel && deviceChannel) int err = 0; @@ -270,25 +255,21 @@ int CUController::initDevice() { return err; } -//--------------------------------------------------------------------------------------------------- int CUController::startDevice() { CHAOS_ASSERT(deviceChannel) return deviceChannel->startDevice(millisecToWait); } -//--------------------------------------------------------------------------------------------------- int CUController::stopDevice() { CHAOS_ASSERT(deviceChannel) return deviceChannel->stopDevice(millisecToWait); } -//--------------------------------------------------------------------------------------------------- int CUController::deinitDevice() { CHAOS_ASSERT(deviceChannel) return deviceChannel->deinitDevice(millisecToWait); } -//--------------------------------------------------------------------------------------------------- int CUController::restoreDeviceToTag(const std::string& restore_tag) { CHAOS_ASSERT(deviceChannel) return deviceChannel->restoreDeviceToTag(restore_tag, @@ -298,7 +279,6 @@ int CUController::recoverDeviceFromError() { CHAOS_ASSERT(deviceChannel) return deviceChannel->recoverDeviceFromError(millisecToWait); } -//--------------------------------------------------------------------------------------------------- uint64_t CUController::getState(CUStateKey::ControlUnitState& deviceState) { uint64_t ret=0; CDataWrapper*tmp=fetchCurrentDatatasetFromDomain(KeyDataStorageDomainHealth).get(); @@ -328,31 +308,26 @@ uint64_t CUController::getState(CUStateKey::ControlUnitState& deviceState) { int CUController::getChannelsNum(){ return channel_keys.size(); } -//--------------------------------------------------------------------------------------------------- int CUController::setAttributeValue(string& attributeName, int32_t attributeValue) { return setAttributeValue(attributeName.c_str(), attributeValue); } -//--------------------------------------------------------------------------------------------------- int CUController::setAttributeValue(const char *attributeName, int32_t attributeValue) { CDataWrapper attributeValuePack; attributeValuePack.addInt32Value(attributeName, attributeValue); return deviceChannel->setAttributeValue(attributeValuePack, millisecToWait); } -//--------------------------------------------------------------------------------------------------- int CUController::setAttributeValue(string& attributeName, double attributeValue) { return setAttributeValue(attributeName.c_str(), attributeValue); } -//--------------------------------------------------------------------------------------------------- int CUController::setAttributeValue(const char *attributeName, double attributeValue) { CDataWrapper attributeValuePack; attributeValuePack.addDoubleValue(attributeName, attributeValue); return deviceChannel->setAttributeValue(attributeValuePack, millisecToWait); } -//--------------------------------------------------------------------------------------------------- int CUController::setAttributeToValue(const char *attributeName, const char *attributeValue, bool noWait) { int err = ErrorCode::EC_NO_ERROR; CDataWrapper attributeValuePack; @@ -402,7 +377,6 @@ int CUController::setAttributeToValue(const char *attributeName, const char *att return deviceChannel->setAttributeValue(attributeValuePack, noWait, millisecToWait); } -//--------------------------------------------------------------------------------------------------- int CUController::setAttributeToValue(const char *attributeName, void *attributeValue, bool noWait, int32_t bufferValuedDim) { RangeValueInfo range_info; @@ -413,7 +387,6 @@ int CUController::setAttributeToValue(const char *attributeName, void *attribute return setAttributeToValue(attributeName, range_info.valueType, attributeValue, noWait, bufferValuedDim); } -//--------------------------------------------------------------------------------------------------- int CUController::setAttributeToValue(const char *attributeName, DataType::DataType attributeType, void *attributeValue, bool noWait, int32_t bufferValuedDim) { CDataWrapper attributeValuePack; switch (attributeType) { @@ -456,7 +429,6 @@ int CUController::setAttributeToValue(const char *attributeName, DataType::DataT return deviceChannel->setAttributeValue(attributeValuePack, noWait, millisecToWait); } -//--------------------------------------------------------------------------------------------------- int CUController::submitSlowControlCommand(string commandAlias, SubmissionRuleType::SubmissionRule submissionRule, uint32_t priority, @@ -499,7 +471,6 @@ int CUController::submitSlowControlCommand(string commandAlias, return err; } -//--------------------------------------------------------------------------------------------------- int CUController::submitSlowControlCommand(string commandAlias, SubmissionRuleType::SubmissionRule submissionRule, uint64_t& command_id, @@ -539,7 +510,6 @@ int CUController::submitSlowControlCommand(string commandAlias, return err; } -//--------------------------------------------------------------------------------------------------- int CUController::setSlowCommandFeatures(features::Features& features, bool lock_features, uint32_t execution_channel) { CDataWrapper local_command_pack; if(features.featuresFlag & features::FeaturesFlagTypes::FF_LOCK_USER_MOD) { @@ -555,14 +525,12 @@ int CUController::setSlowCommandFeatures(features::Features& features, bool lock return deviceChannel->sendCustomRequest(BatchCommandExecutorRpcActionKey::RPC_SET_COMMAND_FEATURES, &local_command_pack, NULL, millisecToWait); } -//--------------------------------------------------------------------------------------------------- int CUController::setSlowCommandLockOnFeatures(bool lock_features) { CDataWrapper local_command_pack; local_command_pack.addBoolValue(BatchCommandExecutorRpcActionKey::RPC_SET_COMMAND_FEATURES_LOCK_BOOL, lock_features); return deviceChannel->sendCustomRequest(BatchCommandExecutorRpcActionKey::RPC_SET_COMMAND_FEATURES, &local_command_pack, NULL, millisecToWait); } -//--------------------------------------------------------------------------------------------------- int CUController::getCommandState(CommandState& command_state) { CDataWrapper local_command_pack; CDataWrapper *result_data = NULL; @@ -587,31 +555,26 @@ int CUController::getCommandState(CommandState& command_state) { return err; } -//--------------------------------------------------------------------------------------------------- int CUController::killCurrentCommand() { return deviceChannel->sendCustomRequest(BatchCommandExecutorRpcActionKey::RPC_KILL_CURRENT_COMMAND, NULL, NULL, millisecToWait); } -//--------------------------------------------------------------------------------------------------- int CUController::flushCommandStateHistory() { return deviceChannel->sendCustomRequest(BatchCommandExecutorRpcActionKey::RPC_FLUSH_COMMAND_HISTORY, NULL, NULL, millisecToWait); } -//--------------------------------------------------------------------------------------------------- int CUController::sendCustomRequest(const std::string& action, common::data::CDataWrapper * const param, common::data::CDataWrapper**const result) { return deviceChannel->sendCustomRequest(action, param, result, millisecToWait); } -//--------------------------------------------------------------------------------------------------- void CUController::sendCustomMessage(const std::string& action, common::data::CDataWrapper * const param) { deviceChannel->sendCustomMessage(action, param); } -//--------------------------------------------------------------------------------------------------- int CUController::checkRPCInformation(CDataWrapper **result_information, uint32_t timeout) { int err = -1; @@ -628,7 +591,6 @@ int CUController::checkRPCInformation(CDataWrapper **result_information, return err; } -//--------------------------------------------------------------------------------------------------- int CUController::echoTest(CDataWrapper * const echo_data, CDataWrapper **echo_data_result, uint32_t timeout) { @@ -646,19 +608,16 @@ int CUController::echoTest(CDataWrapper * const echo_data, return err; } -//--------------------------------------------------------------------------------------------------- ChaosUniquePtr<MessageRequestFuture> CUController::sendCustomRequestWithFuture(const std::string& action_name, common::data::CDataWrapper *request_date) { return deviceChannel->sendCustomRequestWithFuture(action_name, request_date); } -//--------------------------------------------------------------------------------------------------- int CUController::setAttributeValue(string& attributeName, string& attributeValue) { return setAttributeValue(attributeName, attributeValue.c_str(),(uint32_t)attributeValue.size()); } -//--------------------------------------------------------------------------------------------------- int CUController::setAttributeValue(string& attributeName, const char* attributeValue) { return setAttributeValue(attributeName, attributeValue,(uint32_t)strlen(attributeValue)); } @@ -670,7 +629,6 @@ std::vector<chaos::common::data::RangeValueInfo> CUController::getDeviceValuesIn return ret; } -//--------------------------------------------------------------------------------------------------- int CUController::setAttributeValue(string& attributeName, const char* attributeValue, uint32_t size) { CDataWrapper attributeValuePack; const char *attrname=attributeName.c_str(); @@ -713,7 +671,6 @@ int CUController::setAttributeValue(string& attributeName, const char* attribute return ErrorCode::EC_ATTRIBUTE_TYPE_NOT_SUPPORTED; } -//--------------------------------------------------------------------------------------------------- void CUController::initializeAttributeIndexMap() { // boost::mutex::scoped_lock lock(trackMutext); vector<string> attributeNames; @@ -754,7 +711,6 @@ void CUController::initializeAttributeIndexMap() { } -//--------------------------------------------------------------------------------------------------- void CUController::allocateNewLiveBufferForAttributeAndType(string& attributeName, DataType::DataSetAttributeIOAttribute attributeDirection, DataType::DataType attrbiuteType) { @@ -795,7 +751,6 @@ void CUController::allocateNewLiveBufferForAttributeAndType(string& attributeNam } -//--------------------------------------------------------------------------------------------------- UIDataBuffer *CUController::getBufferForAttribute(string& attributeName) { boost::mutex::scoped_lock lock(trackMutext); UIDataBuffer * result = NULL; @@ -820,7 +775,6 @@ UIDataBuffer *CUController::getBufferForAttribute(string& attributeName) { return result; } -//--------------------------------------------------------------------------------------------------- PointerBuffer *CUController::getPtrBufferForAttribute(string& attributeName) { boost::mutex::scoped_lock lock(trackMutext); PointerBuffer * result = NULL; @@ -838,12 +792,10 @@ PointerBuffer *CUController::getPtrBufferForAttribute(string& attributeName) { return result; } -//--------------------------------------------------------------------------------------------------- UIDataBuffer *CUController::getPtrBufferForTimestamp(const int initialDimension) { return int64AttributeLiveBuffer.count(DataPackCommonKey::DPCK_TIMESTAMP)>0? int64AttributeLiveBuffer[DataPackCommonKey::DPCK_TIMESTAMP]:NULL; } -//--------------------------------------------------------------------------------------------------- void CUController::deinitializeAttributeIndexMap() { // boost::mutex::scoped_lock lock(trackMutext); //dispose circula buffer @@ -876,7 +828,6 @@ void CUController::deinitializeAttributeIndexMap() { pointerAttributeLiveBuffer.clear(); } -//--------------------------------------------------------------------------------------------------- void CUController::addAttributeToTrack(string& attr) { boost::mutex::scoped_lock lock(trackMutext); @@ -890,13 +841,11 @@ void CUController::addAttributeToTrack(string& attr) { allocateNewLiveBufferForAttributeAndType(attr, attributeValueMap[attr].dir, attributeValueMap[attr].valueType); } -//--------------------------------------------------------------------------------------------------- CDataWrapper * CUController::getLiveCDataWrapperPtr() { return current_dataset[KeyDataStorageDomainOutput].get(); } -//--------------------------------------------------------------------------------------------------- ChaosSharedPtr<chaos::common::data::CDataWrapper> CUController::getCurrentDatasetForDomain(DatasetDomain domain) { boost::mutex::scoped_lock lock(trackMutext); if(domain<current_dataset.size()){ @@ -948,7 +897,6 @@ int CUController::fetchAllDataset() { } -//--------------------------------------------------------------------------------------------------- ChaosSharedPtr<chaos::common::data::CDataWrapper> CUController::fetchCurrentDatatasetFromDomain(DatasetDomain domain) { boost::mutex::scoped_lock lock(trackMutext); size_t value_len = 0; @@ -962,7 +910,6 @@ ChaosSharedPtr<chaos::common::data::CDataWrapper> CUController::fetchCurrentDat return current_dataset[domain]; } -//--------------------------------------------------------------------------------------------------- int CUController::getTimeStamp(uint64_t& live){ CDataWrapper * d = current_dataset[KeyDataStorageDomainOutput].get(); live =0; @@ -972,7 +919,6 @@ int CUController::getTimeStamp(uint64_t& live){ } return -1; } -//--------------------------------------------------------------------------------------------------- void CUController::setupTracking() { boost::mutex::scoped_lock lock(trackMutext); @@ -984,13 +930,11 @@ void CUController::setupTracking() { int64AttributeLiveBuffer.insert(make_pair(DataPackCommonKey::DPCK_TIMESTAMP, newBuffer)); } -//--------------------------------------------------------------------------------------------------- void CUController::stopTracking() { boost::mutex::scoped_lock lock(trackMutext); deinitializeAttributeIndexMap(); } -//--------------------------------------------------------------------------------------------------- void CUController::fetchCurrentDeviceValue() { boost::mutex::scoped_lock lock(trackMutext); diff --git a/ChaosMetadataServiceClient/node_controller/CUController.h b/chaos_metadata_service_client/node_controller/CUController.h similarity index 99% rename from ChaosMetadataServiceClient/node_controller/CUController.h rename to chaos_metadata_service_client/node_controller/CUController.h index dcdf21bd4..d3509f39c 100644 --- a/ChaosMetadataServiceClient/node_controller/CUController.h +++ b/chaos_metadata_service_client/node_controller/CUController.h @@ -31,9 +31,12 @@ #include <chaos/common/message/DeviceMessageChannel.h> #include <chaos/common/utility/SingleBufferCircularBuffer.h> #include <chaos/cu_toolkit/data_manager/KeyDataStorage.h> +#include <chaos/common/io/IODirectIODriver.h> + +//#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> + #include <boost/thread/mutex.hpp> #include <boost/shared_ptr.hpp> -#include <chaos/common/io/IODirectIODriver.h> #include <map> @@ -68,7 +71,7 @@ namespace chaos { //! Device MEssage channel to control via chaos rpc the device chaos::common::message::DeviceMessageChannel *deviceChannel; //! The io driver for accessing live data of the device - chaos::common::io::ioDataDriver_shr ioLiveDataDriver; + chaos::common::io::IODataDriverShrdPtr ioLiveDataDriver; //!Dataset database chaos::common::data::DatasetDB datasetDB; //!point to the freashest live value for this device dataset @@ -123,7 +126,7 @@ namespace chaos { /*! The visibility of the constructor is private */ - CUController(const std::string& _deviceID, chaos::common::io::ioDataDriver_shr ioLiveDataDriver); + CUController(const std::string& _deviceID, chaos::common::io::IODataDriverShrdPtr ioLiveDataDriver); //!Public destructor diff --git a/ChaosMetadataServiceClient/node_monitor/ControlUnitController.cpp b/chaos_metadata_service_client/node_monitor/ControlUnitController.cpp similarity index 98% rename from ChaosMetadataServiceClient/node_monitor/ControlUnitController.cpp rename to chaos_metadata_service_client/node_monitor/ControlUnitController.cpp index a4569ecd5..376b01a50 100644 --- a/ChaosMetadataServiceClient/node_monitor/ControlUnitController.cpp +++ b/chaos_metadata_service_client/node_monitor/ControlUnitController.cpp @@ -20,8 +20,8 @@ */ #include <chaos/common/chaos_constants.h> -#include <ChaosMetadataServiceClient/node_monitor/ControlUnitController.h> -#include <ChaosMetadataServiceClient/node_monitor/ControlUnitMonitorHandler.h> +#include <chaos_metadata_service_client/node_monitor/ControlUnitController.h> +#include <chaos_metadata_service_client/node_monitor/ControlUnitMonitorHandler.h> #include <boost/format.hpp> diff --git a/ChaosMetadataServiceClient/node_monitor/ControlUnitController.h b/chaos_metadata_service_client/node_monitor/ControlUnitController.h similarity index 98% rename from ChaosMetadataServiceClient/node_monitor/ControlUnitController.h rename to chaos_metadata_service_client/node_monitor/ControlUnitController.h index e5fafe4a7..5d9bae2d0 100644 --- a/ChaosMetadataServiceClient/node_monitor/ControlUnitController.h +++ b/chaos_metadata_service_client/node_monitor/ControlUnitController.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__ControlUnitMonitor_h #define __CHAOSFramework__ControlUnitMonitor_h -#include <ChaosMetadataServiceClient/node_monitor/NodeController.h> +#include <chaos_metadata_service_client/node_monitor/NodeController.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/node_monitor/ControlUnitMonitorHandler.cpp b/chaos_metadata_service_client/node_monitor/ControlUnitMonitorHandler.cpp similarity index 93% rename from ChaosMetadataServiceClient/node_monitor/ControlUnitMonitorHandler.cpp rename to chaos_metadata_service_client/node_monitor/ControlUnitMonitorHandler.cpp index f3ac76f08..36025a425 100644 --- a/ChaosMetadataServiceClient/node_monitor/ControlUnitMonitorHandler.cpp +++ b/chaos_metadata_service_client/node_monitor/ControlUnitMonitorHandler.cpp @@ -20,7 +20,7 @@ */ -#include <ChaosMetadataServiceClient/node_monitor/ControlUnitMonitorHandler.h> +#include <chaos_metadata_service_client/node_monitor/ControlUnitMonitorHandler.h> using namespace chaos::metadata_service_client::node_monitor; @@ -37,4 +37,4 @@ void ControlUnitMonitorHandler::updatedDS(const std::string& control_unit_uid, void ControlUnitMonitorHandler::noDSDataFound(const std::string& control_unit_uid, int dataset_type) { -} \ No newline at end of file +} diff --git a/ChaosMetadataServiceClient/node_monitor/ControlUnitMonitorHandler.h b/chaos_metadata_service_client/node_monitor/ControlUnitMonitorHandler.h similarity index 95% rename from ChaosMetadataServiceClient/node_monitor/ControlUnitMonitorHandler.h rename to chaos_metadata_service_client/node_monitor/ControlUnitMonitorHandler.h index 3ed6f76d2..aa20e1ea1 100644 --- a/ChaosMetadataServiceClient/node_monitor/ControlUnitMonitorHandler.h +++ b/chaos_metadata_service_client/node_monitor/ControlUnitMonitorHandler.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__ControlUnitMonitorHandler_h #define __CHAOSFramework__ControlUnitMonitorHandler_h -#include <ChaosMetadataServiceClient/node_monitor/NodeMonitorHandler.h> +#include <chaos_metadata_service_client/node_monitor/NodeMonitorHandler.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/node_monitor/NodeController.cpp b/chaos_metadata_service_client/node_monitor/NodeController.cpp similarity index 99% rename from ChaosMetadataServiceClient/node_monitor/NodeController.cpp rename to chaos_metadata_service_client/node_monitor/NodeController.cpp index 3a379fe6e..bf2a56824 100644 --- a/ChaosMetadataServiceClient/node_monitor/NodeController.cpp +++ b/chaos_metadata_service_client/node_monitor/NodeController.cpp @@ -19,7 +19,8 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/node_monitor/NodeController.h> +#include <chaos/common/global.h> +#include <chaos_metadata_service_client/node_monitor/NodeController.h> #include <boost/format.hpp> diff --git a/ChaosMetadataServiceClient/node_monitor/NodeController.h b/chaos_metadata_service_client/node_monitor/NodeController.h similarity index 96% rename from ChaosMetadataServiceClient/node_monitor/NodeController.h rename to chaos_metadata_service_client/node_monitor/NodeController.h index f27fcbd73..918a1774b 100644 --- a/ChaosMetadataServiceClient/node_monitor/NodeController.h +++ b/chaos_metadata_service_client/node_monitor/NodeController.h @@ -24,8 +24,8 @@ #include <chaos/common/chaos_types.h> -#include <ChaosMetadataServiceClient/monitor_system/monitor_system.h> -#include <ChaosMetadataServiceClient/node_monitor/NodeMonitorHandler.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system_types.h> +#include <chaos_metadata_service_client/node_monitor/NodeMonitorHandler.h> #include <boost/thread.hpp> diff --git a/ChaosMetadataServiceClient/node_monitor/NodeFetcher.cpp b/chaos_metadata_service_client/node_monitor/NodeFetcher.cpp similarity index 97% rename from ChaosMetadataServiceClient/node_monitor/NodeFetcher.cpp rename to chaos_metadata_service_client/node_monitor/NodeFetcher.cpp index 597d151b5..f18dbb160 100644 --- a/ChaosMetadataServiceClient/node_monitor/NodeFetcher.cpp +++ b/chaos_metadata_service_client/node_monitor/NodeFetcher.cpp @@ -19,7 +19,8 @@ * permissions and limitations under the Licence. */ -#include "NodeFetcher.h" +#include <chaos_metadata_service_client/node_monitor/NodeFetcher.h> +#include <chaos_metadata_service_client/node_monitor/ControlUnitController.h> using namespace chaos::metadata_service_client::node_monitor; using namespace chaos::metadata_service_client::monitor_system; diff --git a/ChaosMetadataServiceClient/node_monitor/NodeFetcher.h b/chaos_metadata_service_client/node_monitor/NodeFetcher.h similarity index 93% rename from ChaosMetadataServiceClient/node_monitor/NodeFetcher.h rename to chaos_metadata_service_client/node_monitor/NodeFetcher.h index 5f8be6b8d..5079e8c44 100644 --- a/ChaosMetadataServiceClient/node_monitor/NodeFetcher.h +++ b/chaos_metadata_service_client/node_monitor/NodeFetcher.h @@ -23,8 +23,9 @@ #define __CHAOSFramework__NodeFetcher_h #include <chaos/common/chaos_types.h> -#include <ChaosMetadataServiceClient/node_monitor/node_monitor.h> -#include <ChaosMetadataServiceClient/monitor_system/monitor_system.h> +#include <chaos_metadata_service_client/node_monitor/NodeController.h> +#include <chaos_metadata_service_client/node_monitor/node_monitor_types.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system.h> #include <boost/thread.hpp> @@ -33,7 +34,6 @@ namespace chaos { namespace metadata_service_client { - namespace node_monitor { //! forward declaration class NodeMonitor; diff --git a/ChaosMetadataServiceClient/node_monitor/NodeMonitor.cpp b/chaos_metadata_service_client/node_monitor/NodeMonitor.cpp similarity index 88% rename from ChaosMetadataServiceClient/node_monitor/NodeMonitor.cpp rename to chaos_metadata_service_client/node_monitor/NodeMonitor.cpp index 62cea6c96..6da332d4f 100644 --- a/ChaosMetadataServiceClient/node_monitor/NodeMonitor.cpp +++ b/chaos_metadata_service_client/node_monitor/NodeMonitor.cpp @@ -19,19 +19,18 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/node_monitor/NodeMonitor.h> -#include <ChaosMetadataServiceClient/node_monitor/ControlUnitController.h> +#include <chaos_metadata_service_client/node_monitor/NodeMonitor.h> +#include <chaos_metadata_service_client/node_monitor/ControlUnitController.h> +#include <chaos_metadata_service_client/ChaosMetadataServiceClient.h> #include <boost/format.hpp> - +using namespace chaos::metadata_service_client; using namespace chaos::metadata_service_client::node_monitor; NodeMonitor::NodeMonitor(chaos::metadata_service_client::monitor_system::MonitorManager *_monitor_manager, - chaos::metadata_service_client::api_proxy::ApiProxyManager *_api_proxy_manager, - ClientSetting *_setting): + chaos::metadata_service_client::api_proxy::ApiProxyManager *_api_proxy_manager): monitor_manager(_monitor_manager), -api_proxy_manager(_api_proxy_manager), -setting(_setting) {} +api_proxy_manager(_api_proxy_manager){} NodeMonitor::~NodeMonitor() { map_fetcher.clear(); diff --git a/ChaosMetadataServiceClient/node_monitor/NodeMonitor.h b/chaos_metadata_service_client/node_monitor/NodeMonitor.h similarity index 83% rename from ChaosMetadataServiceClient/node_monitor/NodeMonitor.h rename to chaos_metadata_service_client/node_monitor/NodeMonitor.h index 83da67dde..72199632b 100644 --- a/ChaosMetadataServiceClient/node_monitor/NodeMonitor.h +++ b/chaos_metadata_service_client/node_monitor/NodeMonitor.h @@ -22,12 +22,10 @@ #ifndef __CHAOSFramework__NodeMonitor_h #define __CHAOSFramework__NodeMonitor_h -#include <ChaosMetadataServiceClient/api_proxy/ApiProxyManager.h> -#include <ChaosMetadataServiceClient/node_monitor/NodeController.h> -#include <ChaosMetadataServiceClient/monitor_system/monitor_system.h> -#include <ChaosMetadataServiceClient/metadata_service_client_types.h> -#include <ChaosMetadataServiceClient/node_monitor/node_monitor_types.h> -#include <ChaosMetadataServiceClient/node_monitor/NodeFetcher.h> +#include <chaos_metadata_service_client/api_proxy/ApiProxyManager.h> +#include <chaos_metadata_service_client/node_monitor/NodeController.h> +#include <chaos_metadata_service_client/monitor_system/monitor_system.h> +#include <chaos_metadata_service_client/node_monitor/NodeFetcher.h> #include <chaos/common/chaos_types.h> #include <chaos/common/utility/InizializableService.h> @@ -47,8 +45,6 @@ namespace chaos { class NodeMonitor: public chaos::common::utility::InizializableService { - //! library settings - ClientSetting *setting; friend class chaos::common::utility::InizializableServiceContainer<NodeMonitor>; friend class chaos::metadata_service_client::ChaosMetadataServiceClient; @@ -58,12 +54,9 @@ namespace chaos { boost::mutex map_fetcher_mutex; NodeFetcherMap map_fetcher; - - protected: NodeMonitor(chaos::metadata_service_client::monitor_system::MonitorManager *_monitor_manager, - chaos::metadata_service_client::api_proxy::ApiProxyManager *_api_proxy_manager, - chaos::metadata_service_client::ClientSetting *_setting); + chaos::metadata_service_client::api_proxy::ApiProxyManager *_api_proxy_manager); ~NodeMonitor(); void init(void *init_data) throw (chaos::CException); void deinit() throw (chaos::CException); diff --git a/ChaosMetadataServiceClient/node_monitor/NodeMonitorHandler.cpp b/chaos_metadata_service_client/node_monitor/NodeMonitorHandler.cpp similarity index 97% rename from ChaosMetadataServiceClient/node_monitor/NodeMonitorHandler.cpp rename to chaos_metadata_service_client/node_monitor/NodeMonitorHandler.cpp index f5c075e5f..37a3ef6fe 100644 --- a/ChaosMetadataServiceClient/node_monitor/NodeMonitorHandler.cpp +++ b/chaos_metadata_service_client/node_monitor/NodeMonitorHandler.cpp @@ -19,7 +19,7 @@ * permissions and limitations under the Licence. */ -#include <ChaosMetadataServiceClient/node_monitor/NodeMonitorHandler.h> +#include <chaos_metadata_service_client/node_monitor/NodeMonitorHandler.h> using namespace chaos::metadata_service_client::node_monitor; diff --git a/ChaosMetadataServiceClient/node_monitor/NodeMonitorHandler.h b/chaos_metadata_service_client/node_monitor/NodeMonitorHandler.h similarity index 97% rename from ChaosMetadataServiceClient/node_monitor/NodeMonitorHandler.h rename to chaos_metadata_service_client/node_monitor/NodeMonitorHandler.h index b50044855..d402811f1 100644 --- a/ChaosMetadataServiceClient/node_monitor/NodeMonitorHandler.h +++ b/chaos_metadata_service_client/node_monitor/NodeMonitorHandler.h @@ -22,7 +22,7 @@ #ifndef __CHAOSFramework__NodeMonitorHandler_h #define __CHAOSFramework__NodeMonitorHandler_h -#include <ChaosMetadataServiceClient/node_monitor/node_monitor_types.h> +#include <chaos_metadata_service_client/node_monitor/node_monitor_types.h> namespace chaos { namespace metadata_service_client { diff --git a/ChaosMetadataServiceClient/node_monitor/node_monitor.h b/chaos_metadata_service_client/node_monitor/node_monitor.h similarity index 61% rename from ChaosMetadataServiceClient/node_monitor/node_monitor.h rename to chaos_metadata_service_client/node_monitor/node_monitor.h index 03d3cf54a..fc9c507c7 100644 --- a/ChaosMetadataServiceClient/node_monitor/node_monitor.h +++ b/chaos_metadata_service_client/node_monitor/node_monitor.h @@ -22,12 +22,14 @@ #ifndef __CHAOSFramework__node_monitor_h #define __CHAOSFramework__node_monitor_h -#include <ChaosMetadataServiceClient/node_monitor/NodeMonitor.h> -#include <ChaosMetadataServiceClient/node_monitor/NodeController.h> -#include <ChaosMetadataServiceClient/node_monitor/ControlUnitController.h> +#include <chaos_metadata_service_client/node_monitor/NodeMonitor.h> +#include <chaos_metadata_service_client/node_monitor/NodeFetcher.h> -#include <ChaosMetadataServiceClient/node_monitor/NodeMonitorHandler.h> -#include <ChaosMetadataServiceClient/node_monitor/ControlUnitMonitorHandler.h> +#include <chaos_metadata_service_client/node_monitor/NodeController.h> +#include <chaos_metadata_service_client/node_monitor/ControlUnitController.h> -#include <ChaosMetadataServiceClient/node_monitor/node_monitor_types.h> +#include <chaos_metadata_service_client/node_monitor/NodeMonitorHandler.h> +#include <chaos_metadata_service_client/node_monitor/ControlUnitMonitorHandler.h> + +#include <chaos_metadata_service_client/node_monitor/node_monitor_types.h> #endif /* __CHAOSFramework__node_monitor_h */ diff --git a/ChaosMetadataServiceClient/node_monitor/node_monitor_types.h b/chaos_metadata_service_client/node_monitor/node_monitor_types.h similarity index 100% rename from ChaosMetadataServiceClient/node_monitor/node_monitor_types.h rename to chaos_metadata_service_client/node_monitor/node_monitor_types.h diff --git a/chaos_micro_unit_toolkit/CMakeLists.txt b/chaos_micro_unit_toolkit/CMakeLists.txt index e77591877..09cc30839 100644 --- a/chaos_micro_unit_toolkit/CMakeLists.txt +++ b/chaos_micro_unit_toolkit/CMakeLists.txt @@ -8,14 +8,14 @@ SET(source ChaosMicroUnitToolkit.cpp) SET(source ${source} data/DataPack.cpp) SET(source ${source} connection/ConnectionManager.cpp) SET(source ${source} connection/protocol_adapter/AbstractProtocolAdapter.cpp - connection/protocol_adapter/http/HTTPProtocolAdapter.cpp) + connection/protocol_adapter/http/HTTPProtocolAdapter.cpp) SET(source ${source} connection/unit_proxy/AbstractUnitProxy.cpp - connection/unit_proxy/UnitProxyHandlerWrapper.cpp) + connection/unit_proxy/UnitProxyHandlerWrapper.cpp) SET(source ${source} connection/unit_proxy/raw_driver/RawDriverUnitProxy.cpp - connection/unit_proxy/raw_driver/RawDriverHandlerWrapper.cpp) -SET(source ${source} external_lib/jsoncpp.cpp - external_lib/mongoose.c - external_lib/base64.cpp) + connection/unit_proxy/raw_driver/RawDriverHandlerWrapper.cpp) +SET(source ${source} external_lib/jsoncpp.cpp + external_lib/mongoose.c + external_lib/base64.cpp) IF (BUILD_FORCE_STATIC) ADD_LIBRARY(${PROJECT_NAME} STATIC ${source}) -- GitLab