Repository: nifi-minifi-cpp Updated Branches: refs/heads/master 43bd2270c -> 149e96b7d
MINIFICPP-356: This closes #225. Switch site to site API URL from the 0.x endpoint to site-to-site Signed-off-by: joewitt <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/149e96b7 Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/149e96b7 Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/149e96b7 Branch: refs/heads/master Commit: 149e96b7d854fc642cc6b23c67e34e359382b1ec Parents: 43bd227 Author: Marc Parisi <[email protected]> Authored: Thu Dec 21 09:37:11 2017 -0500 Committer: joewitt <[email protected]> Committed: Thu Dec 21 09:44:42 2017 -0500 ---------------------------------------------------------------------- libminifi/src/RemoteProcessorGroupPort.cpp | 2 +- libminifi/test/curl-tests/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/149e96b7/libminifi/src/RemoteProcessorGroupPort.cpp ---------------------------------------------------------------------- diff --git a/libminifi/src/RemoteProcessorGroupPort.cpp b/libminifi/src/RemoteProcessorGroupPort.cpp index 38ba889..1084efb 100644 --- a/libminifi/src/RemoteProcessorGroupPort.cpp +++ b/libminifi/src/RemoteProcessorGroupPort.cpp @@ -222,7 +222,7 @@ void RemoteProcessorGroupPort::refreshRemoteSite2SiteInfo() { if (this->host_.empty() || this->port_ == -1 || this->protocol_.empty()) return; - std::string fullUrl = this->protocol_ + this->host_ + ":" + std::to_string(this->port_) + "/nifi-api/controller"; + std::string fullUrl = this->protocol_ + this->host_ + ":" + std::to_string(this->port_) + "/nifi-api/site-to-site"; this->site2site_port_ = -1; configure_->get(Configure::nifi_rest_api_user_name, this->rest_user_name_); http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/149e96b7/libminifi/test/curl-tests/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/libminifi/test/curl-tests/CMakeLists.txt b/libminifi/test/curl-tests/CMakeLists.txt index 56b3eb2..ff68b8e 100644 --- a/libminifi/test/curl-tests/CMakeLists.txt +++ b/libminifi/test/curl-tests/CMakeLists.txt @@ -71,6 +71,6 @@ add_test(NAME HttpPostIntegrationTest COMMAND HttpPostIntegrationTest "${TEST_RE add_test(NAME HttpPostIntegrationTestChunked COMMAND HttpPostIntegrationTest "${TEST_RESOURCES}/TestHTTPPostChunkedEncoding.yml" "${TEST_RESOURCES}/") add_test(NAME C2VerifyServeResults COMMAND C2VerifyServeResults "${TEST_RESOURCES}/C2VerifyServeResults.yml" "${TEST_RESOURCES}/") add_test(NAME C2VerifyHeartbeatAndStop COMMAND C2VerifyHeartbeatAndStop "${TEST_RESOURCES}/C2VerifyHeartbeatAndStop.yml" "${TEST_RESOURCES}/") -add_test(NAME SiteToSiteRestTest COMMAND SiteToSiteRestTest "${TEST_RESOURCES}/TestSite2SiteRest.yml" "${TEST_RESOURCES}/" "http://localhost:8077/nifi-api/controller";) +add_test(NAME SiteToSiteRestTest COMMAND SiteToSiteRestTest "${TEST_RESOURCES}/TestSite2SiteRest.yml" "${TEST_RESOURCES}/" "http://localhost:8077/nifi-api/site-to-site";) add_test(NAME ControllerServiceIntegrationTests COMMAND ControllerServiceIntegrationTests "${TEST_RESOURCES}/TestControllerServices.yml" "${TEST_RESOURCES}/") add_test(NAME ThreadPoolAdjust COMMAND ThreadPoolAdjust "${TEST_RESOURCES}/TestHTTPPostChunkedEncoding.yml" "${TEST_RESOURCES}/")
