You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2017/11/21 01:26:23 UTC
[3/3] mesos git commit: Bumped the CSI version to ec29890.
Bumped the CSI version to ec29890.
Review: https://reviews.apache.org/r/63966
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b3f81f7e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b3f81f7e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b3f81f7e
Branch: refs/heads/master
Commit: b3f81f7e042befae9e9d3124d1fb83d518cad4df
Parents: 62d1173
Author: Jie Yu <yu...@gmail.com>
Authored: Mon Nov 20 11:39:03 2017 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Mon Nov 20 17:16:23 2017 -0800
----------------------------------------------------------------------
3rdparty/csi-0.1.0.tar.gz | Bin 80603 -> 66799 bytes
src/csi/client.cpp | 16 +++++++++++++---
src/csi/client.hpp | 7 +++++--
src/tests/csi_client_tests.cpp | 3 ++-
src/tests/mock_csi_plugin.hpp | 3 ++-
5 files changed, 22 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b3f81f7e/3rdparty/csi-0.1.0.tar.gz
----------------------------------------------------------------------
diff --git a/3rdparty/csi-0.1.0.tar.gz b/3rdparty/csi-0.1.0.tar.gz
index 1d09c70..d2ff83e 100644
Binary files a/3rdparty/csi-0.1.0.tar.gz and b/3rdparty/csi-0.1.0.tar.gz differ
http://git-wip-us.apache.org/repos/asf/mesos/blob/b3f81f7e/src/csi/client.cpp
----------------------------------------------------------------------
diff --git a/src/csi/client.cpp b/src/csi/client.cpp
index e171f03..b6c28d8 100644
--- a/src/csi/client.cpp
+++ b/src/csi/client.cpp
@@ -111,6 +111,16 @@ Future<GetCapacityResponse> Client::GetCapacity(
}
+Future<ControllerProbeResponse> Client::ControllerProbe(
+ const ControllerProbeRequest& request)
+{
+ return runtime.call(
+ channel,
+ GRPC_RPC(Controller, ControllerProbe),
+ request);
+}
+
+
Future<ControllerGetCapabilitiesResponse> Client::ControllerGetCapabilities(
const ControllerGetCapabilitiesRequest& request)
{
@@ -151,12 +161,12 @@ Future<GetNodeIDResponse> Client::GetNodeID(
}
-Future<ProbeNodeResponse> Client::ProbeNode(
- const ProbeNodeRequest& request)
+Future<NodeProbeResponse> Client::NodeProbe(
+ const NodeProbeRequest& request)
{
return runtime.call(
channel,
- GRPC_RPC(Node, ProbeNode),
+ GRPC_RPC(Node, NodeProbe),
request);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/b3f81f7e/src/csi/client.hpp
----------------------------------------------------------------------
diff --git a/src/csi/client.hpp b/src/csi/client.hpp
index df674e1..a5571f4 100644
--- a/src/csi/client.hpp
+++ b/src/csi/client.hpp
@@ -66,6 +66,9 @@ public:
process::Future<GetCapacityResponse>
GetCapacity(const GetCapacityRequest& request);
+ process::Future<ControllerProbeResponse>
+ ControllerProbe(const ControllerProbeRequest& request);
+
process::Future<ControllerGetCapabilitiesResponse>
ControllerGetCapabilities(const ControllerGetCapabilitiesRequest& request);
@@ -79,8 +82,8 @@ public:
process::Future<GetNodeIDResponse>
GetNodeID(const GetNodeIDRequest& request);
- process::Future<ProbeNodeResponse>
- ProbeNode(const ProbeNodeRequest& request);
+ process::Future<NodeProbeResponse>
+ NodeProbe(const NodeProbeRequest& request);
process::Future<NodeGetCapabilitiesResponse>
NodeGetCapabilities(const NodeGetCapabilitiesRequest& request);
http://git-wip-us.apache.org/repos/asf/mesos/blob/b3f81f7e/src/tests/csi_client_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/csi_client_tests.cpp b/src/tests/csi_client_tests.cpp
index 725466a..2c5dbb7 100644
--- a/src/tests/csi_client_tests.cpp
+++ b/src/tests/csi_client_tests.cpp
@@ -121,6 +121,7 @@ INSTANTIATE_TEST_CASE_P(
RPC_PARAM(Client::ValidateVolumeCapabilities),
RPC_PARAM(Client::ListVolumes),
RPC_PARAM(Client::GetCapacity),
+ RPC_PARAM(Client::ControllerProbe),
RPC_PARAM(Client::ControllerGetCapabilities)),
RPCParam::Printer());
@@ -131,7 +132,7 @@ INSTANTIATE_TEST_CASE_P(
RPC_PARAM(Client::NodePublishVolume),
RPC_PARAM(Client::NodeUnpublishVolume),
RPC_PARAM(Client::GetNodeID),
- RPC_PARAM(Client::ProbeNode),
+ RPC_PARAM(Client::NodeProbe),
RPC_PARAM(Client::NodeGetCapabilities)),
RPCParam::Printer());
http://git-wip-us.apache.org/repos/asf/mesos/blob/b3f81f7e/src/tests/mock_csi_plugin.hpp
----------------------------------------------------------------------
diff --git a/src/tests/mock_csi_plugin.hpp b/src/tests/mock_csi_plugin.hpp
index b7926c4..162dc64 100644
--- a/src/tests/mock_csi_plugin.hpp
+++ b/src/tests/mock_csi_plugin.hpp
@@ -43,11 +43,12 @@ namespace tests {
macro(ValidateVolumeCapabilities) \
macro(ListVolumes) \
macro(GetCapacity) \
+ macro(ControllerProbe) \
macro(ControllerGetCapabilities) \
macro(NodePublishVolume) \
macro(NodeUnpublishVolume) \
macro(GetNodeID) \
- macro(ProbeNode) \
+ macro(NodeProbe) \
macro(NodeGetCapabilities)
#define DECLARE_MOCK_CSI_METHOD(name) \