[Netw Config Manager] Support coexist of gRPC and REST APIs

services/network_config_manager/src/main/java/com/futurewei/alcor/netwconfigmanager/NetworkConfigManagerApplication.java

@@ -17,6 +17,7 @@ free of charge, to any person obtaining a copy of this software and associated d
 
 import com.futurewei.alcor.common.tracer.TracerConfiguration;
 import com.futurewei.alcor.netwconfigmanager.server.NetworkConfigServer;
+import com.futurewei.alcor.netwconfigmanager.server.grpc.GoalStateProvisionerServer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -27,7 +28,6 @@ free of charge, to any person obtaining a copy of this software and associated d
 import javax.annotation.PostConstruct;
 
 @SpringBootApplication
-@ComponentScan(value = "com.futurewei.alcor.netwconfigmanager.server")
 @EnableAsync
 @Import(TracerConfiguration.class)
 public class NetworkConfigManagerApplication {
@@ -37,13 +37,15 @@ public class NetworkConfigManagerApplication {
 
     @PostConstruct
     public void instantiateGrpcServer(){
-        try {
-            networkConfigServer.start();
-            networkConfigServer.blockUntilShutdown();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
+        Thread server = new Thread(() -> {
+            try {
+                networkConfigServer.start();
+                networkConfigServer.blockUntilShutdown();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        });
+        server.start();
     }
 
     public static void main(String[] args) {

services/network_config_manager/src/main/java/com/futurewei/alcor/netwconfigmanager/client/GoalStateClient.java

@@ -18,6 +18,7 @@ free of charge, to any person obtaining a copy of this software and associated d
 import com.futurewei.alcor.netwconfigmanager.entity.HostGoalState;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

services/network_config_manager/src/main/java/com/futurewei/alcor/netwconfigmanager/client/gRPC/GoalStateClientImpl.java

@@ -30,6 +30,8 @@ free of charge, to any person obtaining a copy of this software and associated d
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.stub.StreamObserver;
 import io.netty.util.concurrent.DefaultThreadFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import java.util.*;
 import java.util.concurrent.*;
@@ -48,33 +50,34 @@ public class GoalStateClientImpl implements GoalStateClient {
     private final ExecutorService executor;
 
     // each host_ip should have this amount of gRPC channels
+    @Value("${grpc.number-of-channels-per-host:1}")
     private int numberOfGrpcChannelPerHost;
 
     // when a channel is set up, send this amount of default GoalStates for warmup.
+    @Value("${grpc.number-of-warmups-per-channel:1}")
     private int numberOfWarmupsPerChannel;
 
     // prints out UUID and time, when sending a GoalState to any of the monitorHosts
     private ArrayList<String> monitorHosts;
 
     private ConcurrentHashMap<String, ArrayList<GrpcChannelStub>> hostIpGrpcChannelStubMap;
 
-
     public static GoalStateClientImpl getInstance(int numberOfGrpcChannelPerHost, int numberOfWarmupsPerChannel, ArrayList<String> monitorHosts) {
         if (instance == null) {
             instance = new GoalStateClientImpl(numberOfGrpcChannelPerHost, numberOfWarmupsPerChannel, monitorHosts);
         }
         return instance;
     }
 
-    public GoalStateClientImpl(int numberOfGrpcChannelPerHost, int numberOfWarmupsPerChannel, ArrayList<String> monitorHosts) {
-        // each host should have at least 1 gRPC channel
-        if(numberOfGrpcChannelPerHost < 1) {
-            numberOfGrpcChannelPerHost = 1;
-        }
 
-        // allow users to not send warmups, if they wish to.
-        if(numberOfWarmupsPerChannel < 0){
-            numberOfWarmupsPerChannel = 0;
+    public GoalStateClientImpl(@Value("${grpc.number-of-channels-per-host:1}") int numberOfGrpcChannelPerHost, @Value("${grpc.number-of-warmups-per-channel:1}") int numberOfWarmupsPerChannel, @Value("")ArrayList<String> monitorHosts) {
+
+        if ((this.numberOfGrpcChannelPerHost = numberOfGrpcChannelPerHost) < 1) {
+            this.numberOfGrpcChannelPerHost = 1;
+         }
+
+        if ((this.numberOfWarmupsPerChannel = numberOfWarmupsPerChannel) < 0) {
+            this.numberOfWarmupsPerChannel = 0;
         }
 
         this.monitorHosts = monitorHosts;
@@ -83,8 +86,6 @@ public GoalStateClientImpl(int numberOfGrpcChannelPerHost, int numberOfWarmupsPe
             logger.log(Level.FINE, "Monitoring this host: "+ host);
         }
         logger.log(Level.FINE, "Done printing out all monitorHosts");
-        this.numberOfGrpcChannelPerHost = numberOfGrpcChannelPerHost;
-        this.numberOfWarmupsPerChannel = numberOfWarmupsPerChannel;
         this.hostAgentPort = 50001;
 
         this.executor = new ThreadPoolExecutor(100,
@@ -96,6 +97,7 @@ public GoalStateClientImpl(int numberOfGrpcChannelPerHost, int numberOfWarmupsPe
         //TODO: Setup a connection pool. one ACA, one client.
         this.hostIpGrpcChannelStubMap = new ConcurrentHashMap();
         logger.log(Level.FINE, "This instance has "+ numberOfGrpcChannelPerHost+" channels, and "+ numberOfWarmupsPerChannel+" warmups");
+
     }
 
     @Override
@@ -286,4 +288,4 @@ public GrpcChannelStub(ManagedChannel channel, GoalStateProvisionerGrpc.GoalStat
             this.stub = stub;
         }
     }
-}
+}

services/network_config_manager/src/main/java/com/futurewei/alcor/netwconfigmanager/server/grpc/GoalStateProvisionerServer.java

@@ -45,7 +45,6 @@ free of charge, to any person obtaining a copy of this software and associated d
 
 @Component
 @Configurable
-@ComponentScan(value = "com.futurewei.alcor.netwconfigmanager.service")
 public class GoalStateProvisionerServer implements NetworkConfigServer {
     private static final Logger logger = LoggerFactory.getLogger();
 
@@ -70,8 +69,8 @@ public class GoalStateProvisionerServer implements NetworkConfigServer {
     @Autowired
     private GoalStatePersistenceService goalStatePersistenceService;
 
-//    @Autowired
-//    private GoalStateClient grpcGoalStateClient;
+    @Autowired
+    private GoalStateClient grpcGoalStateClient;
 
     public GoalStateProvisionerServer() {
         this.port = 9016; // TODO: make this configurable
@@ -163,8 +162,7 @@ public void onNext(Goalstate.GoalStateV2 value) {
                     // filter neighbor/SG update, and send them down to target ACA
                     try {
                         Map<String, HostGoalState> filteredGoalStates = NetworkConfigManagerUtil.filterNeighbors(hostGoalStates);
-
-                        GoalStateClient grpcGoalStateClient =  GoalStateClientImpl.getInstance(numberOfGrpcChannelPerHost, numberOfWarmupsPerChannel, monitorHosts);
+                        GoalStateClient grpcGoalStateClient = GoalStateClientImpl.getInstance(numberOfGrpcChannelPerHost, numberOfWarmupsPerChannel, monitorHosts);
 
                         //TODO use filteredGoalStates
                         grpcGoalStateClient.sendGoalStates(hostGoalStates);
@@ -265,7 +263,6 @@ public void requestGoalStates(Goalstateprovisioner.HostRequest request,
                                 hostGoalState.toString());
                     }
                 }
-
                 GoalStateClient grpcGoalStateClient = GoalStateClientImpl.getInstance(numberOfGrpcChannelPerHost, numberOfWarmupsPerChannel, monitorHosts);
                 long end = System.currentTimeMillis();
                 logger.log(Level.FINE, "requestGoalStates : Pushing GS with UUID: " + state_request_uuid + " at: " + end);

services/network_config_manager/src/test/java/com/futurewei/alcor/netwconfigmanager/server/grpc/GoalStateProvisionerServerTest.java

@@ -93,7 +93,7 @@ private String pushGoalState() {
                 hostGoalStates.get(DemoUtil.aca_node_one_ip).getGoalState().toString());
 
         try {
-            GoalStateClient grpcGoalStateClient = new GoalStateClientImpl(1,1, new ArrayList<>());
+            GoalStateClient grpcGoalStateClient = new GoalStateClientImpl(1, 1, new ArrayList<>());
             grpcGoalStateClient.sendGoalStates(hostGoalStates);
         } catch (Exception e) {
             e.printStackTrace();