[Network Config Mgr] Support on-demand service and GS persistence service (#607)

Author: Liguang Xie

services/data_plane_manager/src/main/java/com/futurewei/alcor/dataplane/cache/NodeInfoCache.java

@@ -13,7 +13,6 @@ free of charge, to any person obtaining a copy of this software and associated d
     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-
 package com.futurewei.alcor.dataplane.cache;
 
 import com.futurewei.alcor.common.db.CacheFactory;

services/data_plane_manager/src/main/java/com/futurewei/alcor/dataplane/cache/NodeTopicCache.java

@@ -1,21 +1,19 @@
-package com.futurewei.alcor.dataplane.cache;
 /*
- *
- * Copyright 2019 The Alcor Authors.
- *
- * Licensed 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.
- * /
- */
+MIT License
+Copyright(c) 2020 Futurewei Cloud
+
+    Permission is hereby granted,
+    free of charge, to any person obtaining a copy of this software and associated documentation files(the "Software"), to deal in the Software without restriction,
+    including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and / or sell copies of the Software, and to permit persons
+    to whom the Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+package com.futurewei.alcor.dataplane.cache;
 
 import com.futurewei.alcor.common.db.CacheFactory;
 import com.futurewei.alcor.common.db.ICache;

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

@@ -17,23 +17,35 @@ free of charge, to any person obtaining a copy of this software and associated d
 
 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;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
 
 @SpringBootApplication
+@ComponentScan(value = "com.futurewei.alcor.netwconfigmanager.server")
 @EnableAsync
 public class NetworkConfigManagerApplication {
 
-    public static void main(String[] args) {
-        SpringApplication.run(NetworkConfigManagerApplication.class, args);
+    @Autowired
+    private NetworkConfigServer networkConfigServer;
 
-        NetworkConfigServer networkConfigServer = new GoalStateProvisionerServer();
+    @PostConstruct
+    public void instantiateGrpcServer(){
         try {
             networkConfigServer.start();
             networkConfigServer.blockUntilShutdown();
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
+
+    public static void main(String[] args) {
+        SpringApplication.run(NetworkConfigManagerApplication.class, args);
+    }
 }

services/network_config_manager/src/main/java/com/futurewei/alcor/netwconfigmanager/cache/HostResourceMetadataCache.java

@@ -13,7 +13,6 @@ free of charge, to any person obtaining a copy of this software and associated d
     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-
 package com.futurewei.alcor.netwconfigmanager.cache;
 
 import com.futurewei.alcor.common.db.CacheFactory;

services/network_config_manager/src/main/java/com/futurewei/alcor/netwconfigmanager/cache/ResourceStateCache.java

@@ -13,7 +13,6 @@ free of charge, to any person obtaining a copy of this software and associated d
     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-
 package com.futurewei.alcor.netwconfigmanager.cache;
 
 import com.futurewei.alcor.common.db.CacheFactory;

services/network_config_manager/src/main/java/com/futurewei/alcor/netwconfigmanager/cache/VpcResourceCache.java

@@ -13,7 +13,6 @@ free of charge, to any person obtaining a copy of this software and associated d
     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-
 package com.futurewei.alcor.netwconfigmanager.cache;
 
 import com.futurewei.alcor.common.db.CacheFactory;
@@ -28,7 +27,7 @@ free of charge, to any person obtaining a copy of this software and associated d
 @ComponentScan(value = "com.futurewei.alcor.common.db")
 public class VpcResourceCache {
 
-    // Map <VNI, Map<PIP, List<ResoruceIDType>>
+    // Map <VNI, Map<PIP, ResourceMetadata>
     private ICache<String, VpcResourceMeta> vpcResourceMetas;
 
     @Autowired

services/network_config_manager/src/main/java/com/futurewei/alcor/netwconfigmanager/client/gRPC/GoalStateClientImpl.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.logging.Logger;
 import com.futurewei.alcor.common.logging.LoggerFactory;
+import com.futurewei.alcor.common.stats.DurationStatistics;
 import com.futurewei.alcor.netwconfigmanager.client.GoalStateClient;
 import com.futurewei.alcor.netwconfigmanager.config.Config;
 import com.futurewei.alcor.netwconfigmanager.entity.HostGoalState;
@@ -63,6 +64,7 @@ public GoalStateClientImpl() {
     }
 
     @Override
+    @DurationStatistics
     public List<String> sendGoalStates(Map<String, HostGoalState> hostGoalStates) throws Exception {
         List<Future<HostGoalState>>
                 futures = new ArrayList<>(hostGoalStates.size());

services/network_config_manager/src/main/java/com/futurewei/alcor/netwconfigmanager/constant/Constants.java

@@ -13,7 +13,6 @@ free of charge, to any person obtaining a copy of this software and associated d
     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-
 package com.futurewei.alcor.netwconfigmanager.constant;
 
 public class Constants {

services/network_config_manager/src/main/java/com/futurewei/alcor/netwconfigmanager/controller/NetworkConfigController.java

@@ -44,8 +44,10 @@ public class NetworkConfigController {
 
     @Autowired
     private NodeService nodeService;
+
     @Autowired
     private HttpServletRequest request;
+
     @PostMapping({"/nodes", "/v4/nodes"})
     @ResponseStatus(HttpStatus.CREATED)
     @DurationStatistics

services/network_config_manager/src/main/java/com/futurewei/alcor/netwconfigmanager/entity/ResourceMeta.java

@@ -13,7 +13,6 @@ free of charge, to any person obtaining a copy of this software and associated d
     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-
 package com.futurewei.alcor.netwconfigmanager.entity;
 
 import com.futurewei.alcor.schema.Goalstate;
@@ -54,6 +53,9 @@ public void setOwnerId(String ownerId) {
         this.ownerId = ownerId;
     }
 
+    ////////////////////////
+    // Vpc related methods
+    ////////////////////////
     public Set<String> getVpcIds() {
         return this.vpcIds;
     }
@@ -62,14 +64,18 @@ public String getDefaultVpcId() {
         return this.vpcIds != null && this.vpcIds.size() > 0 ? this.vpcIds.iterator().next() : UNEXPECTED_RESOURCE_ID;
     }
 
-    public void addVpcId(String newId) {
+    public ResourceMeta addVpcId(String newId) {
         this.vpcIds.add(newId);
+        return this;
     }
 
     public void deleteVpcId(String delId) {
         this.vpcIds.remove(delId);
     }
 
+    ////////////////////////
+    // Subnet related methods
+    ////////////////////////
     public Set<String> getSubnetIds() {
         return this.subnetIds;
     }
@@ -78,11 +84,96 @@ public String getDefaultSubnetId() {
         return this.subnetIds != null && this.subnetIds.size() > 0 ? this.subnetIds.iterator().next() : UNEXPECTED_RESOURCE_ID;
     }
 
-    public void addSubnetId(String newId) {
+    public ResourceMeta addSubnetId(String newId) {
         this.subnetIds.add(newId);
+        return this;
     }
 
     public void deleteSubnetId(String delId) {
         this.subnetIds.remove(delId);
     }
+
+    ////////////////////////
+    // Port related methods
+    ////////////////////////
+    public Set<String> getPortIds() {
+        return this.portIds;
+    }
+
+    public String getDefaultPortId() {
+        return this.portIds != null && this.portIds.size() > 0 ? this.portIds.iterator().next() : UNEXPECTED_RESOURCE_ID;
+    }
+
+    public ResourceMeta addPortId(String newId) {
+        this.portIds.add(newId);
+        return this;
+    }
+
+    public void deletePortId(String delId) {
+        this.portIds.remove(delId);
+    }
+
+    ////////////////////////
+    // Neighbor related methods
+    ////////////////////////
+    public Map<String, String> getNeighborIdMap() {
+        return this.neighborMap;
+    }
+
+    public ResourceMeta addNeighborEntry(String neighborIp, String neighborId) {
+        this.neighborMap.put(neighborIp, neighborId);
+        return this;
+    }
+
+    public void deleteNeighborEntry(String neighborIp) {
+        this.neighborMap.remove(neighborIp);
+    }
+
+    ////////////////////////
+    // Dhcp related methods
+    ////////////////////////
+    public Set<String> getDhcpIds() {
+        return this.dhcpIds;
+    }
+
+    public ResourceMeta addDhcpId(String newId) {
+        this.dhcpIds.add(newId);
+        return this;
+    }
+
+    public void deleteDhcpId(String delId) {
+        this.dhcpIds.remove(delId);
+    }
+
+    ////////////////////////
+    // Router related methods
+    ////////////////////////
+    public Set<String> getRouterIds() {
+        return this.routerIds;
+    }
+
+    public ResourceMeta addRouterId(String newId) {
+        this.routerIds.add(newId);
+        return this;
+    }
+
+    public void deleteRouterId(String delId) {
+        this.routerIds.remove(delId);
+    }
+
+    ////////////////////////
+    // SG related methods
+    ////////////////////////
+    public ResourceMeta addSecurityGroupId(String newId) {
+        this.securityGroupIds.add(newId);
+        return this;
+    }
+
+    ////////////////////////
+    // Gateway related methods
+    ////////////////////////
+    public ResourceMeta addGatewayId(String newId) {
+        this.gatewayIds.add(newId);
+        return this;
+    }
 }