Add vni GoalState

arion_master/pom.xml

@@ -121,6 +121,7 @@
         <dependency>
             <groupId>com.github.futurewei-cloud</groupId>
             <artifactId>alcor</artifactId>
+            <version>bfdbd34f4dee79e068ed353bce4d31045908b2d8</version>
             <exclusions>
                 <exclusion>  <!-- declare the exclusion here -->
                     <groupId>*</groupId>

arion_master/src/main/java/com/futurewei/arionmaster/grpc/ArionServerService.java

@@ -1,18 +1,19 @@
 package com.futurewei.arionmaster.grpc;
 
-import com.futurewei.alcor.schema.Goalstateprovisioner;
 import com.futurewei.arion.schema.ArionMasterServiceGrpc;
 import com.futurewei.arion.schema.Arionmaster;
 import com.futurewei.arionmaster.service.GoalStatePersistenceService;
 import com.futurewei.common.executor.AsyncExecutor;
 import io.grpc.stub.StreamObserver;
+import net.devh.boot.grpc.server.service.GrpcService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 
+@GrpcService
 public class ArionServerService extends ArionMasterServiceGrpc.ArionMasterServiceImplBase {
     private static final Logger logger = LoggerFactory.getLogger(ArionServerService.class);
 

arion_master/src/main/java/com/futurewei/arionmaster/service/impl/Watcher.java

@@ -136,6 +136,7 @@ public Arionmaster.NeighborRule buildNeighborRule(NeighborRule neighborRule, Com
         neighborRuleBuilder.setHostip(neighborRule.getHostIp());
         neighborRuleBuilder.setHostmac(neighborRule.getHostMac());
         neighborRuleBuilder.setArionwingGroup(neighborRule.getArionGroup());
+        neighborRuleBuilder.setTunnelId(neighborRule.getVni());
         neighborRuleBuilder.setVersion(neighborRule.getVersion());
         return neighborRuleBuilder.build();
     }

schema/proto3/arionmaster.proto

@@ -21,13 +21,8 @@ package arion.schema;
 option java_package = "com.futurewei.arion.schema";
 
 import "common.proto";
-import "neighbor.proto";
 
 service ArionMasterService {
-
-  rpc PushGoalstates (NeighborRulesRequest) returns (GoalStateOperationReply) {
-  }
-
   rpc RequestGoalstates (HostRequest) returns (NeighborRulesResponse) {
   }
 
@@ -62,13 +57,6 @@ message NeighborRule {
   uint64 version = 8;
 }
 
-message NeighborRulesRequest {
-  uint32 format_version = 1;
-  string request_id = 2;
-
-  repeated NeighborState neigborstates = 3;
-}
-
 message NeighborRulesResponse {
   uint32 format_version = 1;