pvillard31 commented on code in PR #11715: URL: https://github.com/apache/nifi/pull/11715#discussion_r4142867638
########## nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestFlowController.java: ########## @@ -0,0 +1,315 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.controller; + +import org.apache.nifi.admin.service.AuditService; +import org.apache.nifi.authorization.Authorizer; +import org.apache.nifi.cluster.coordination.ClusterCoordinator; +import org.apache.nifi.cluster.coordination.heartbeat.HeartbeatMonitor; +import org.apache.nifi.cluster.coordination.node.NodeConnectionStatus; +import org.apache.nifi.cluster.protocol.DataFlow; +import org.apache.nifi.cluster.protocol.NodeIdentifier; +import org.apache.nifi.cluster.protocol.NodeProtocolSender; +import org.apache.nifi.components.connector.ConnectorRequestReplicator; +import org.apache.nifi.components.state.StateManagerProvider; +import org.apache.nifi.controller.leader.election.LeaderElectionManager; +import org.apache.nifi.controller.metrics.ComponentMetricReporter; +import org.apache.nifi.controller.repository.FlowFileEventRepository; +import org.apache.nifi.controller.repository.metrics.RingBufferEventRepository; +import org.apache.nifi.controller.serialization.FlowSynchronizer; +import org.apache.nifi.controller.status.history.StatusHistoryRepository; +import org.apache.nifi.events.VolatileBulletinRepository; +import org.apache.nifi.groups.BundleUpdateStrategy; +import org.apache.nifi.nar.ExtensionDiscoveringManager; +import org.apache.nifi.nar.StandardExtensionDiscoveringManager; +import org.apache.nifi.nar.SystemBundle; +import org.apache.nifi.provenance.MockProvenanceRepository; +import org.apache.nifi.security.encryption.InternalPassThroughPropertyEncryptionProvider; +import org.apache.nifi.security.encryption.PropertyEncryptionProvider; +import org.apache.nifi.services.FlowService; +import org.apache.nifi.util.NiFiProperties; +import org.apache.nifi.web.revision.RevisionManager; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.opentest4j.AssertionFailedError; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +public class TestFlowController { Review Comment: done ########## nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestFlowController.java: ########## @@ -0,0 +1,315 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.controller; + +import org.apache.nifi.admin.service.AuditService; +import org.apache.nifi.authorization.Authorizer; +import org.apache.nifi.cluster.coordination.ClusterCoordinator; +import org.apache.nifi.cluster.coordination.heartbeat.HeartbeatMonitor; +import org.apache.nifi.cluster.coordination.node.NodeConnectionStatus; +import org.apache.nifi.cluster.protocol.DataFlow; +import org.apache.nifi.cluster.protocol.NodeIdentifier; +import org.apache.nifi.cluster.protocol.NodeProtocolSender; +import org.apache.nifi.components.connector.ConnectorRequestReplicator; +import org.apache.nifi.components.state.StateManagerProvider; +import org.apache.nifi.controller.leader.election.LeaderElectionManager; +import org.apache.nifi.controller.metrics.ComponentMetricReporter; +import org.apache.nifi.controller.repository.FlowFileEventRepository; +import org.apache.nifi.controller.repository.metrics.RingBufferEventRepository; +import org.apache.nifi.controller.serialization.FlowSynchronizer; +import org.apache.nifi.controller.status.history.StatusHistoryRepository; +import org.apache.nifi.events.VolatileBulletinRepository; +import org.apache.nifi.groups.BundleUpdateStrategy; +import org.apache.nifi.nar.ExtensionDiscoveringManager; +import org.apache.nifi.nar.StandardExtensionDiscoveringManager; +import org.apache.nifi.nar.SystemBundle; +import org.apache.nifi.provenance.MockProvenanceRepository; +import org.apache.nifi.security.encryption.InternalPassThroughPropertyEncryptionProvider; +import org.apache.nifi.security.encryption.PropertyEncryptionProvider; +import org.apache.nifi.services.FlowService; +import org.apache.nifi.util.NiFiProperties; +import org.apache.nifi.web.revision.RevisionManager; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.opentest4j.AssertionFailedError; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +public class TestFlowController { + + private final List<FlowController> flowControllers = new ArrayList<>(); + private final AtomicInteger controllerCounter = new AtomicInteger(); + + @TempDir + private Path tempDir; + + @Test + void shouldRemainStandaloneWhenConnectionStatusIsAssigned() throws IOException { Review Comment: done ########## nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestFlowController.java: ########## @@ -0,0 +1,315 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.controller; + +import org.apache.nifi.admin.service.AuditService; +import org.apache.nifi.authorization.Authorizer; +import org.apache.nifi.cluster.coordination.ClusterCoordinator; +import org.apache.nifi.cluster.coordination.heartbeat.HeartbeatMonitor; +import org.apache.nifi.cluster.coordination.node.NodeConnectionStatus; +import org.apache.nifi.cluster.protocol.DataFlow; +import org.apache.nifi.cluster.protocol.NodeIdentifier; +import org.apache.nifi.cluster.protocol.NodeProtocolSender; +import org.apache.nifi.components.connector.ConnectorRequestReplicator; +import org.apache.nifi.components.state.StateManagerProvider; +import org.apache.nifi.controller.leader.election.LeaderElectionManager; +import org.apache.nifi.controller.metrics.ComponentMetricReporter; +import org.apache.nifi.controller.repository.FlowFileEventRepository; +import org.apache.nifi.controller.repository.metrics.RingBufferEventRepository; +import org.apache.nifi.controller.serialization.FlowSynchronizer; +import org.apache.nifi.controller.status.history.StatusHistoryRepository; +import org.apache.nifi.events.VolatileBulletinRepository; +import org.apache.nifi.groups.BundleUpdateStrategy; +import org.apache.nifi.nar.ExtensionDiscoveringManager; +import org.apache.nifi.nar.StandardExtensionDiscoveringManager; +import org.apache.nifi.nar.SystemBundle; +import org.apache.nifi.provenance.MockProvenanceRepository; +import org.apache.nifi.security.encryption.InternalPassThroughPropertyEncryptionProvider; +import org.apache.nifi.security.encryption.PropertyEncryptionProvider; +import org.apache.nifi.services.FlowService; +import org.apache.nifi.util.NiFiProperties; +import org.apache.nifi.web.revision.RevisionManager; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.opentest4j.AssertionFailedError; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +public class TestFlowController { + + private final List<FlowController> flowControllers = new ArrayList<>(); + private final AtomicInteger controllerCounter = new AtomicInteger(); + + @TempDir + private Path tempDir; + + @Test + void shouldRemainStandaloneWhenConnectionStatusIsAssigned() throws IOException { + final FlowController flowController = createStandaloneFlowController(); + + assertEquals(NodeConnectionState.STANDALONE, flowController.getNodeConnectionState()); + + flowController.setConnectionStatus(new NodeConnectionStatus(createNodeIdentifier("standalone-node"), org.apache.nifi.cluster.coordination.node.NodeConnectionState.CONNECTED)); + + assertEquals(NodeConnectionState.STANDALONE, flowController.getNodeConnectionState()); + } + + @Test + void shouldReportDisconnectedForNewClusteredController() throws IOException { + final FlowController flowController = createClusteredFlowController(); + + assertEquals(NodeConnectionState.DISCONNECTED, flowController.getNodeConnectionState()); + } + + @ParameterizedTest + @MethodSource("supportedClusterProtocolStates") + void shouldMapClusterProtocolNodeStatesToApiNodeStates( + final org.apache.nifi.cluster.coordination.node.NodeConnectionState protocolState, + final NodeConnectionState apiState) throws IOException { + final FlowController flowController = createClusteredFlowController(); + + flowController.setConnectionStatus(new NodeConnectionStatus(createNodeIdentifier("clustered-node"), protocolState)); + + assertEquals(apiState, flowController.getNodeConnectionState()); + } + + @Test + void shouldProvideNodeConnectionStateDuringFlowSynchronization() throws Exception { + final FlowController flowController = createClusteredFlowController(); + flowController.setConnectionStatus(new NodeConnectionStatus( + createNodeIdentifier("clustered-node"), Review Comment: done -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
