From 0e92f99495ab1d38b5f224e286b2357531c6e49f Mon Sep 17 00:00:00 2001 From: Liguang Xie Date: Thu, 2 Apr 2020 17:32:01 -0700 Subject: [PATCH] [Microservices] Route manager (#144) The Route Manager could store routing tables/rules for vpc, subnet, and gateway. It will interact with vpc manager, subnet manager, and gateway manager. * New APIs: Add get/create apis on route manager and interaction with vpc manager * Schema update: Add web route schema and update vpc schema * Service codes: new route manager server codes * Code structure: package path update for common lib, vpc manager * Deployment: Update docker and pom files * Deployment: Remove lib jar and add dependency on pom for route manager * Deployment: Update dynamically load configuration file in kubernetes Co-authored-by: Kevin --- .gitignore | 4 + kubernetes/services/api-gateway.yaml | 6 +- .../services}/redis.yaml | 3 +- kubernetes/services/redis_route.yaml | 36 ++ .../services/route_manager.yaml | 22 +- kubernetes/services/vpc_manager.yaml | 68 ++++ .../exception/ResourceNotFoundException.java | 1 - .../apigateway/vpc/VpcWebDestinations.java | 3 +- services/route_manager/.gitignore | 35 ++ .../.mvn/wrapper/MavenWrapperDownloader.java | 0 .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 services/route_manager/Dockerfile | 16 + {vpcmanager => services/route_manager}/mvnw | 0 .../route_manager}/mvnw.cmd | 0 services/route_manager/pom.xml | 219 ++++++++++++ .../alcor/route/RouteApplication.java | 13 + .../alcor/route/config/ControllerConfig.java | 25 ++ .../route/config/RedisConfiguration.java | 94 +++++ .../route/controller/RouteController.java | 94 +++++ .../alcor/route/dao/RouteRedisRepository.java | 57 ++++ .../alcor/route/dao/RouteRepository.java | 60 ++++ .../alcor/route/entity/RouteConstant.java | 9 + .../alcor/route/entity/RouteState.java | 39 +++ .../alcor/route/entity/RouteStateJson.java | 23 ++ .../alcor/route/entity/RouteTableType.java | 13 + .../alcor/route}/entity/VpcState.java | 2 +- .../alcor/route/entity/VpcStateJson.java | 40 +++ .../alcor/route/service/RedisPublisher.java | 46 +++ .../route/utils/RestPreconditionsUtil.java | 66 ++++ .../src/main/resources/application.properties | 11 + .../alcor/route/RouteApplicationTests.java | 13 + .../vpc_manager}/.gitignore | 0 .../.mvn/wrapper/MavenWrapperDownloader.java | 118 +++++++ .../.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 50710 bytes .../.mvn/wrapper/maven-wrapper.properties | 2 + .../vpc_manager}/Dockerfile | 0 services/vpc_manager/mvnw | 322 ++++++++++++++++++ services/vpc_manager/mvnw.cmd | 182 ++++++++++ {vpcmanager => services/vpc_manager}/pom.xml | 15 +- .../vpcmanager/VpcManagerApplication.java | 0 .../vpcmanager/config/ControllerConfig.java | 0 .../vpcmanager/config/RedisConfiguration.java | 0 .../controller/DebugController.java | 0 .../controller/DebugVpcController.java | 0 .../vpcmanager/controller/VpcController.java | 25 ++ .../vpcmanager/dao/VpcRedisRepository.java | 0 .../alcor/vpcmanager/dao/VpcRepository.java | 0 .../vpcmanager/entity/CustomerResource.java | 86 +++++ .../alcor/vpcmanager/entity/DebugInfo.java | 0 .../vpcmanager/entity/RouteTableType.java | 29 ++ .../alcor/vpcmanager/entity/RouteWebJson.java | 40 +++ .../vpcmanager/entity/RouteWebObject.java | 93 +++++ .../alcor/vpcmanager/entity/VpcState.java | 59 ++++ .../alcor/vpcmanager/entity/VpcStateJson.java | 0 .../vpcmanager/service/RedisPublisher.java | 0 .../utils/RestPreconditionsUtil.java | 0 .../src/main/resources/application.properties | 5 +- .../src/main/resources/templates/start.html | 2 +- .../VpcManagerApplicationTests.java | 0 .../kubernetes/vpc-manager-redis-pod.yaml | 18 - .../lib/alcor_common_lib-0.1.0-SNAPSHOT.jar | Bin 57551 -> 0 bytes .../alcor/web/entity/RouteTableType.java | 29 ++ .../alcor/web/entity/RouteWebJson.java | 32 ++ .../alcor/web/entity/RouteWebObject.java | 53 +++ .../alcor/web/entity/VpcWebObject.java | 21 +- 66 files changed, 2093 insertions(+), 56 deletions(-) rename {vpcmanager/kubernetes => kubernetes/services}/redis.yaml (88%) create mode 100644 kubernetes/services/redis_route.yaml rename vpcmanager/kubernetes/vpc-manager.yaml => kubernetes/services/route_manager.yaml (51%) create mode 100644 kubernetes/services/vpc_manager.yaml create mode 100644 services/route_manager/.gitignore rename {vpcmanager => services/route_manager}/.mvn/wrapper/MavenWrapperDownloader.java (100%) rename {vpcmanager => services/route_manager}/.mvn/wrapper/maven-wrapper.jar (100%) rename {vpcmanager => services/route_manager}/.mvn/wrapper/maven-wrapper.properties (100%) create mode 100644 services/route_manager/Dockerfile rename {vpcmanager => services/route_manager}/mvnw (100%) rename {vpcmanager => services/route_manager}/mvnw.cmd (100%) create mode 100644 services/route_manager/pom.xml create mode 100644 services/route_manager/src/main/java/com/futurewei/alcor/route/RouteApplication.java create mode 100644 services/route_manager/src/main/java/com/futurewei/alcor/route/config/ControllerConfig.java create mode 100644 services/route_manager/src/main/java/com/futurewei/alcor/route/config/RedisConfiguration.java create mode 100644 services/route_manager/src/main/java/com/futurewei/alcor/route/controller/RouteController.java create mode 100644 services/route_manager/src/main/java/com/futurewei/alcor/route/dao/RouteRedisRepository.java create mode 100644 services/route_manager/src/main/java/com/futurewei/alcor/route/dao/RouteRepository.java create mode 100644 services/route_manager/src/main/java/com/futurewei/alcor/route/entity/RouteConstant.java create mode 100644 services/route_manager/src/main/java/com/futurewei/alcor/route/entity/RouteState.java create mode 100644 services/route_manager/src/main/java/com/futurewei/alcor/route/entity/RouteStateJson.java create mode 100644 services/route_manager/src/main/java/com/futurewei/alcor/route/entity/RouteTableType.java rename {vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager => services/route_manager/src/main/java/com/futurewei/alcor/route}/entity/VpcState.java (96%) create mode 100644 services/route_manager/src/main/java/com/futurewei/alcor/route/entity/VpcStateJson.java create mode 100644 services/route_manager/src/main/java/com/futurewei/alcor/route/service/RedisPublisher.java create mode 100644 services/route_manager/src/main/java/com/futurewei/alcor/route/utils/RestPreconditionsUtil.java create mode 100644 services/route_manager/src/main/resources/application.properties create mode 100644 services/route_manager/src/test/java/com/futurewei/alcor/route/RouteApplicationTests.java rename {vpcmanager => services/vpc_manager}/.gitignore (100%) create mode 100644 services/vpc_manager/.mvn/wrapper/MavenWrapperDownloader.java create mode 100644 services/vpc_manager/.mvn/wrapper/maven-wrapper.jar create mode 100644 services/vpc_manager/.mvn/wrapper/maven-wrapper.properties rename {vpcmanager => services/vpc_manager}/Dockerfile (100%) create mode 100644 services/vpc_manager/mvnw create mode 100644 services/vpc_manager/mvnw.cmd rename {vpcmanager => services/vpc_manager}/pom.xml (97%) rename {vpcmanager => services/vpc_manager}/src/main/java/com/futurewei/alcor/vpcmanager/VpcManagerApplication.java (100%) rename {vpcmanager => services/vpc_manager}/src/main/java/com/futurewei/alcor/vpcmanager/config/ControllerConfig.java (100%) rename {vpcmanager => services/vpc_manager}/src/main/java/com/futurewei/alcor/vpcmanager/config/RedisConfiguration.java (100%) rename {vpcmanager => services/vpc_manager}/src/main/java/com/futurewei/alcor/vpcmanager/controller/DebugController.java (100%) rename {vpcmanager => services/vpc_manager}/src/main/java/com/futurewei/alcor/vpcmanager/controller/DebugVpcController.java (100%) rename {vpcmanager => services/vpc_manager}/src/main/java/com/futurewei/alcor/vpcmanager/controller/VpcController.java (84%) rename {vpcmanager => services/vpc_manager}/src/main/java/com/futurewei/alcor/vpcmanager/dao/VpcRedisRepository.java (100%) rename {vpcmanager => services/vpc_manager}/src/main/java/com/futurewei/alcor/vpcmanager/dao/VpcRepository.java (100%) create mode 100644 services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/CustomerResource.java rename {vpcmanager => services/vpc_manager}/src/main/java/com/futurewei/alcor/vpcmanager/entity/DebugInfo.java (100%) create mode 100644 services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/RouteTableType.java create mode 100644 services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/RouteWebJson.java create mode 100644 services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/RouteWebObject.java create mode 100644 services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/VpcState.java rename {vpcmanager => services/vpc_manager}/src/main/java/com/futurewei/alcor/vpcmanager/entity/VpcStateJson.java (100%) rename {vpcmanager => services/vpc_manager}/src/main/java/com/futurewei/alcor/vpcmanager/service/RedisPublisher.java (100%) rename {vpcmanager => services/vpc_manager}/src/main/java/com/futurewei/alcor/vpcmanager/utils/RestPreconditionsUtil.java (100%) rename {vpcmanager => services/vpc_manager}/src/main/resources/application.properties (87%) rename {vpcmanager => services/vpc_manager}/src/main/resources/templates/start.html (78%) rename {vpcmanager => services/vpc_manager}/src/test/java/com/futurewei/alcor/vpcmanager/VpcManagerApplicationTests.java (100%) delete mode 100644 vpcmanager/kubernetes/vpc-manager-redis-pod.yaml delete mode 100644 vpcmanager/lib/alcor_common_lib-0.1.0-SNAPSHOT.jar create mode 100644 web/src/main/java/com/futurewei/alcor/web/entity/RouteTableType.java create mode 100644 web/src/main/java/com/futurewei/alcor/web/entity/RouteWebJson.java create mode 100644 web/src/main/java/com/futurewei/alcor/web/entity/RouteWebObject.java diff --git a/.gitignore b/.gitignore index 086bc8ba..4bd51ca9 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,7 @@ fabric.properties # Vpcmanager files vpcmanager/target/ lib/target/ + +### Logs ### +*.log +*.gz \ No newline at end of file diff --git a/kubernetes/services/api-gateway.yaml b/kubernetes/services/api-gateway.yaml index e48e71af..ed20d72a 100644 --- a/kubernetes/services/api-gateway.yaml +++ b/kubernetes/services/api-gateway.yaml @@ -8,14 +8,16 @@ spec: selector: matchLabels: app: apimanager - replicas: 1 + replicas: 2 + #replicas: 3 template: metadata: labels: app: apimanager spec: containers: - - image: zhonghaolyu/repo:apiKube4 + - image: fwnetworking/controller:api_gateway-v0.3.0 + #- image: zhonghaolyu/repo:apiKube6 name: apimanager-web imagePullPolicy: IfNotPresent ports: diff --git a/vpcmanager/kubernetes/redis.yaml b/kubernetes/services/redis.yaml similarity index 88% rename from vpcmanager/kubernetes/redis.yaml rename to kubernetes/services/redis.yaml index 77a648b7..0332592e 100644 --- a/vpcmanager/kubernetes/redis.yaml +++ b/kubernetes/services/redis.yaml @@ -28,7 +28,8 @@ spec: app: redis spec: containers: - - image: redis + #- image: redis + - image: fwnetworking/controller:redis name: redis imagePullPolicy: IfNotPresent ports: diff --git a/kubernetes/services/redis_route.yaml b/kubernetes/services/redis_route.yaml new file mode 100644 index 00000000..6e035ce7 --- /dev/null +++ b/kubernetes/services/redis_route.yaml @@ -0,0 +1,36 @@ +apiVersion: v1 +kind: Service +metadata: + name: redis-route-sr + labels: + name: redis-route +spec: + ports: + - port: 6380 + targetPort: 6379 + selector: + app: redis-route +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: redis-route + name: redis-route +spec: + selector: + matchLabels: + app: redis-route + replicas: 1 + template: + metadata: + labels: + app: redis-route + spec: + containers: + #- image: redis + - image: fwnetworking/controller:redis + name: redis-route + imagePullPolicy: IfNotPresent + ports: + - containerPort: 6379 \ No newline at end of file diff --git a/vpcmanager/kubernetes/vpc-manager.yaml b/kubernetes/services/route_manager.yaml similarity index 51% rename from vpcmanager/kubernetes/vpc-manager.yaml rename to kubernetes/services/route_manager.yaml index b75cdc86..9fc3fe33 100644 --- a/vpcmanager/kubernetes/vpc-manager.yaml +++ b/kubernetes/services/route_manager.yaml @@ -2,21 +2,23 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app: vpcmanager - name: vpcmanager + app: routemanager + name: routemanager spec: selector: matchLabels: - app: vpcmanager + app: routemanager replicas: 1 + #replicas: 3 template: metadata: labels: - app: vpcmanager + app: routemanager spec: containers: - - image: zhonghaolyu/repo:test1 - name: vpcmanager-web + #- image: zhonghaolyu/repo:routeKube3 + - image: fwnetworking/controller:route_manager-v0.3.0 + name: routemanager-web imagePullPolicy: IfNotPresent ports: - containerPort: 8080 @@ -24,13 +26,13 @@ spec: apiVersion: v1 kind: Service metadata: - name: vpcmanager-service + name: routemanager-service labels: - name: vpcmanager-service + name: routemanager-service spec: type: NodePort ports: - port: 8080 - nodePort: 30002 + nodePort: 30003 selector: - app: vpcmanager \ No newline at end of file + app: routemanager diff --git a/kubernetes/services/vpc_manager.yaml b/kubernetes/services/vpc_manager.yaml new file mode 100644 index 00000000..bb74f87f --- /dev/null +++ b/kubernetes/services/vpc_manager.yaml @@ -0,0 +1,68 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: vpc-configmap +data: + application.properties: | + spring.redis.host=10.109.127.248 + spring.redis.port=6379 + logging.level.root=info + logging.level.org.springframework.web=info + logging.file.path=. + logging.type=file + apache.kafka.address=172.17.0.1:9092 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: vpcmanager + name: vpcmanager +spec: + selector: + matchLabels: + app: vpcmanager + replicas: 2 + #replicas: 3 + template: + metadata: + labels: + app: vpcmanager + spec: + volumes: + - name: vpc-volume + configMap: + name: vpc-configmap + items: + - key: application.properties + path: application.properties + containers: + #- image: zhonghaolyu/repo:vpcKube4 + - image: fwnetworking/controller:vpc_manager-v0.3.0 + name: vpcmanager-web + imagePullPolicy: IfNotPresent + command: ["java", "-jar", "/app/AlcorVpcManager-0.1.0.jar", "--spring.config.location=/etc/app/application.properties"] + ports: + - containerPort: 8080 + volumeMounts: + - name: vpc-volume + mountPath: /etc/app + envFrom: + - configMapRef: + name: vpc-configmap +--- +apiVersion: v1 +kind: Service +metadata: + name: vpcmanager-service + labels: + name: vpcmanager-service +spec: + type: NodePort + ports: + - port: 8001 + targetPort: 8080 + nodePort: 30001 + selector: + app: vpcmanager + diff --git a/lib/src/main/java/com/futurewei/alcor/common/exception/ResourceNotFoundException.java b/lib/src/main/java/com/futurewei/alcor/common/exception/ResourceNotFoundException.java index 35936847..e562a906 100644 --- a/lib/src/main/java/com/futurewei/alcor/common/exception/ResourceNotFoundException.java +++ b/lib/src/main/java/com/futurewei/alcor/common/exception/ResourceNotFoundException.java @@ -34,5 +34,4 @@ public ResourceNotFoundException(String message, Throwable cause) { public ResourceNotFoundException(Throwable cause) { super(cause); } - } diff --git a/services/api_gateway/src/main/java/com/futurewei/alcor/apigateway/vpc/VpcWebDestinations.java b/services/api_gateway/src/main/java/com/futurewei/alcor/apigateway/vpc/VpcWebDestinations.java index 6e7ed1f6..ddb31e34 100644 --- a/services/api_gateway/src/main/java/com/futurewei/alcor/apigateway/vpc/VpcWebDestinations.java +++ b/services/api_gateway/src/main/java/com/futurewei/alcor/apigateway/vpc/VpcWebDestinations.java @@ -25,7 +25,8 @@ @ConfigurationProperties(prefix = "vpc.destinations") public class VpcWebDestinations { - private String defaultServiceUrl = "http://192.168.1.17:30001"; + private String defaultServiceUrl = "http://192.168.1.17:30001"; // Kubernetes + //private String defaultServiceUrl = "http://192.168.137.1:8080"; // DOcker @NotNull private String vpcManagerServiceUrl; diff --git a/services/route_manager/.gitignore b/services/route_manager/.gitignore new file mode 100644 index 00000000..41610829 --- /dev/null +++ b/services/route_manager/.gitignore @@ -0,0 +1,35 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/** +!**/src/test/** + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ + +### VS Code ### +.vscode/ + +### Logs ### +*.log +*.gz \ No newline at end of file diff --git a/vpcmanager/.mvn/wrapper/MavenWrapperDownloader.java b/services/route_manager/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from vpcmanager/.mvn/wrapper/MavenWrapperDownloader.java rename to services/route_manager/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/vpcmanager/.mvn/wrapper/maven-wrapper.jar b/services/route_manager/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from vpcmanager/.mvn/wrapper/maven-wrapper.jar rename to services/route_manager/.mvn/wrapper/maven-wrapper.jar diff --git a/vpcmanager/.mvn/wrapper/maven-wrapper.properties b/services/route_manager/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from vpcmanager/.mvn/wrapper/maven-wrapper.properties rename to services/route_manager/.mvn/wrapper/maven-wrapper.properties diff --git a/services/route_manager/Dockerfile b/services/route_manager/Dockerfile new file mode 100644 index 00000000..19e8885d --- /dev/null +++ b/services/route_manager/Dockerfile @@ -0,0 +1,16 @@ +# Dockerfile for VPC Manager + +FROM openjdk:8 + +MAINTAINER Zhonghao Lyu + +# Route Manager process +EXPOSE 8080 +# ROute Manager admin process + +# Generate container image and run container +COPY ./target/AlcorRouteManager-0.1.0-SNAPSHOT.jar /app/AlcorRouteManager-0.1.0.jar +#COPY ./config/machine.json /app/config/machine.json + +CMD ["java", "-jar", "/app/AlcorRouteManager-0.1.0.jar"] + diff --git a/vpcmanager/mvnw b/services/route_manager/mvnw similarity index 100% rename from vpcmanager/mvnw rename to services/route_manager/mvnw diff --git a/vpcmanager/mvnw.cmd b/services/route_manager/mvnw.cmd similarity index 100% rename from vpcmanager/mvnw.cmd rename to services/route_manager/mvnw.cmd diff --git a/services/route_manager/pom.xml b/services/route_manager/pom.xml new file mode 100644 index 00000000..d40997da --- /dev/null +++ b/services/route_manager/pom.xml @@ -0,0 +1,219 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.2.5.RELEASE + + + com.futurewei.alcor.route + AlcorRouteManager + 0.1.0-SNAPSHOT + AlcorRouteManager + Alcor Route Manager + + + 1.8 + 1.7 + 1.7 + 1.5.6 + ${project.basedir}/target/generated-snippets/ + + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-data-redis + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-web + + + org.apache.kafka + kafka-clients + 2.3.0 + + + com.google.protobuf + protobuf-java + 3.8.0 + + + org.projectlombok + lombok + 1.18.0 + + + mysql + mysql-connector-java + runtime + + + org.apache.commons + commons-pool2 + 2.4.2 + + + io.grpc + grpc-netty-shaded + 1.23.0 + + + io.grpc + grpc-protobuf + 1.23.0 + + + io.grpc + grpc-stub + 1.23.0 + + + com.googlecode.json-simple + json-simple + 1.1.1 + + + org.springframework.kafka + spring-kafka + + + org.apache.ignite + ignite-core + 2.8.0 + + + io.grpc + protoc-gen-grpc-java + 1.23.0 + pom + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + + + + com.futurewei.alcor.common + AlcorCommonLib + 0.1.0-SNAPSHOT + compile + + + + + + + + kr.motd.maven + os-maven-plugin + 1.4.1.Final + + + + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + com.futurewei.alcor.route.RouteApplication + + + + + repackage + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.0 + + + + true + lib/ + com.futurewei.alcor.route.RouteApplication + + + + + + + + + + + + + com.spotify + docker-maven-plugin + 1.0.0 + + ${project.groupId}-${project.artifactId} + + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + + + + + lib + BOOT-INF/lib/ + + **/*.jar + + + + src/main/resources + + + + + diff --git a/services/route_manager/src/main/java/com/futurewei/alcor/route/RouteApplication.java b/services/route_manager/src/main/java/com/futurewei/alcor/route/RouteApplication.java new file mode 100644 index 00000000..efdffc54 --- /dev/null +++ b/services/route_manager/src/main/java/com/futurewei/alcor/route/RouteApplication.java @@ -0,0 +1,13 @@ +package com.futurewei.alcor.route; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class RouteApplication { + + public static void main(String[] args) { + SpringApplication.run(RouteApplication.class, args); + } + +} diff --git a/services/route_manager/src/main/java/com/futurewei/alcor/route/config/ControllerConfig.java b/services/route_manager/src/main/java/com/futurewei/alcor/route/config/ControllerConfig.java new file mode 100644 index 00000000..ebf65da6 --- /dev/null +++ b/services/route_manager/src/main/java/com/futurewei/alcor/route/config/ControllerConfig.java @@ -0,0 +1,25 @@ +/* +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. +*/ + +package com.futurewei.alcor.route.config; + +public class ControllerConfig { + + private static int InitNumOfTransitSwitch = 3; + private static int InitNumOfTransitRouter = 1; + + public static int epCounter = 0; +} diff --git a/services/route_manager/src/main/java/com/futurewei/alcor/route/config/RedisConfiguration.java b/services/route_manager/src/main/java/com/futurewei/alcor/route/config/RedisConfiguration.java new file mode 100644 index 00000000..534ad33f --- /dev/null +++ b/services/route_manager/src/main/java/com/futurewei/alcor/route/config/RedisConfiguration.java @@ -0,0 +1,94 @@ +/* +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. +*/ + +package com.futurewei.alcor.route.config; + +import com.futurewei.alcor.common.repo.ICachePublisher; +import com.futurewei.alcor.common.service.RedisListener; +import com.futurewei.alcor.route.entity.RouteState; +import com.futurewei.alcor.route.service.RedisPublisher; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisStandaloneConfiguration; +import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.listener.ChannelTopic; +import org.springframework.data.redis.listener.RedisMessageListenerContainer; +import org.springframework.data.redis.listener.adapter.MessageListenerAdapter; +import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +@Configuration +@ComponentScan({"com.futurewei.alcor.route.service", "com.futurewei.alcor.common.service"}) +@EntityScan({"com.futurewei.alcor.route.entity}", "com.futurewei.alcor.common.entity"}) +public class RedisConfiguration { + + @Value("${spring.redis.host}") + private String redisHostName; + + @Value("${spring.redis.port}") + private int redisHostPort; + + @Bean + LettuceConnectionFactory lettuceConnectionFactory() { + RedisStandaloneConfiguration configuration = new RedisStandaloneConfiguration(); + configuration.setHostName(redisHostName); + configuration.setPort(redisHostPort); + return new LettuceConnectionFactory(configuration); + } + + @Bean + public RedisTemplate redisRouteTemplate() { + final RedisTemplate template = new RedisTemplate(); + template.setConnectionFactory(lettuceConnectionFactory()); + template.setKeySerializer(new StringRedisSerializer()); + template.setHashValueSerializer(new Jackson2JsonRedisSerializer(RouteState.class)); + template.setValueSerializer(new Jackson2JsonRedisSerializer(RouteState.class)); + return template; + } + + @Bean + MessageListenerAdapter redisListenerInstance() { + return new MessageListenerAdapter(new RedisListener()); + } + + @Bean + RedisMessageListenerContainer redisContainer() { + final RedisMessageListenerContainer container = new RedisMessageListenerContainer(); + container.setConnectionFactory(lettuceConnectionFactory()); + container.addMessageListener(redisListenerInstance(), topic()); + return container; + } + + @Bean + ICachePublisher redisVpcPublisherInstance() { + return new RedisPublisher(redisRouteTemplate(), topic()); + } + +// @Bean +// ICachePublisher redisSubnetPublisherInstance() { +// return new RedisPublisher(redisSubnetTemplate(), topic()); +// } + + @Bean + ChannelTopic topic() { + return new ChannelTopic("pubsub:queue"); + } +} + diff --git a/services/route_manager/src/main/java/com/futurewei/alcor/route/controller/RouteController.java b/services/route_manager/src/main/java/com/futurewei/alcor/route/controller/RouteController.java new file mode 100644 index 00000000..6132afa5 --- /dev/null +++ b/services/route_manager/src/main/java/com/futurewei/alcor/route/controller/RouteController.java @@ -0,0 +1,94 @@ +/* +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. +*/ + +package com.futurewei.alcor.route.controller; + +import com.futurewei.alcor.common.exception.ParameterNullOrEmptyException; +import com.futurewei.alcor.route.dao.RouteRedisRepository; +import com.futurewei.alcor.route.entity.RouteState; +import com.futurewei.alcor.route.entity.RouteStateJson; +import com.futurewei.alcor.route.entity.*; +import com.futurewei.alcor.route.utils.RestPreconditionsUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.*; + +import java.util.UUID; + +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; + +@RestController +public class RouteController { + + @Autowired + private RouteRedisRepository routeRedisRepository; + + @RequestMapping( + method = GET, + value = {"/vpcs/{vpcId}/routes/{routeId}"}) + public RouteStateJson getRule(@PathVariable String vpcId, @PathVariable String routeId) throws Exception { + + RouteState routeState = null; + + try { + RestPreconditionsUtil.verifyParameterNotNullorEmpty(vpcId); + RestPreconditionsUtil.verifyParameterNotNullorEmpty(routeId); + + routeState = this.routeRedisRepository.findItem(routeId); + } catch (ParameterNullOrEmptyException e) { + //TODO: REST error code + throw new Exception(e); + } + + if (routeState == null) { + //TODO: REST error code + return new RouteStateJson(); + } + + return new RouteStateJson(routeState); + } + + @RequestMapping( + method = POST, + value = {"/vpcs/{vpcId}/routes"}) + @ResponseStatus(HttpStatus.CREATED) + public RouteStateJson createVpcDefaultRoute(@PathVariable String vpcId, @RequestBody VpcStateJson resource) throws Exception { + RouteState routeState = null; + + try { + RestPreconditionsUtil.verifyParameterNotNullorEmpty(vpcId); + + VpcState inVpcState = resource.getVpc(); + RestPreconditionsUtil.verifyResourceNotNull(inVpcState); + + String id = UUID.randomUUID().toString(); + String projectId = inVpcState.getProjectId(); + String destination = inVpcState.getCidr(); + String routeTableId = UUID.randomUUID().toString(); + + routeState = new RouteState(projectId, id, "default_route_rule", "", + destination, RouteConstant.DEFAULT_TARGET, RouteConstant.DEFAULT_PRIORITY, RouteConstant.DEFAULT_ROUTE_TABLE_TYPE, routeTableId); + + this.routeRedisRepository.addItem(routeState); + } catch (ParameterNullOrEmptyException e) { + throw new Exception(e); + } + + return new RouteStateJson(routeState); + } + +} diff --git a/services/route_manager/src/main/java/com/futurewei/alcor/route/dao/RouteRedisRepository.java b/services/route_manager/src/main/java/com/futurewei/alcor/route/dao/RouteRedisRepository.java new file mode 100644 index 00000000..7ba65669 --- /dev/null +++ b/services/route_manager/src/main/java/com/futurewei/alcor/route/dao/RouteRedisRepository.java @@ -0,0 +1,57 @@ +package com.futurewei.alcor.route.dao; + +import com.futurewei.alcor.common.exception.CacheException; +import com.futurewei.alcor.common.logging.Logger; +import com.futurewei.alcor.common.logging.LoggerFactory; +import com.futurewei.alcor.common.repo.ICacheRepository; +import com.futurewei.alcor.route.entity.RouteState; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.HashOperations; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Repository; + +import javax.annotation.PostConstruct; +import java.util.Map; +import java.util.logging.Level; + +@Repository +public class RouteRedisRepository implements ICacheRepository { + + private static final String KEY = "RouteState"; + + private RedisTemplate redisTemplate; + + private HashOperations hashOperations; + + @Autowired + public RouteRedisRepository(RedisTemplate redisTemplate) { + this.redisTemplate = redisTemplate; + } + + @PostConstruct + private void init() { + hashOperations = redisTemplate.opsForHash(); + } + + @Override + public RouteState findItem(String id) throws CacheException { + return (RouteState) hashOperations.get(KEY, id); + } + + @Override + public Map findAllItems() throws CacheException { + return hashOperations.entries(KEY); + } + + @Override + public void addItem(RouteState routeState) throws CacheException { + Logger logger = LoggerFactory.getLogger(); + logger.log(Level.INFO, "Route Id:" + routeState.getId()); + hashOperations.put(KEY, routeState.getId(), routeState); + } + + @Override + public void deleteItem(String id) throws CacheException { + hashOperations.delete(KEY, id); + } +} diff --git a/services/route_manager/src/main/java/com/futurewei/alcor/route/dao/RouteRepository.java b/services/route_manager/src/main/java/com/futurewei/alcor/route/dao/RouteRepository.java new file mode 100644 index 00000000..698165b7 --- /dev/null +++ b/services/route_manager/src/main/java/com/futurewei/alcor/route/dao/RouteRepository.java @@ -0,0 +1,60 @@ +package com.futurewei.alcor.route.dao; + +import com.futurewei.alcor.common.exception.CacheException; +import com.futurewei.alcor.common.logging.Logger; +import com.futurewei.alcor.common.logging.LoggerFactory; +import com.futurewei.alcor.common.repo.ICache; +import com.futurewei.alcor.common.repo.ICacheRepository; +import com.futurewei.alcor.common.service.CacheFactory; +import com.futurewei.alcor.route.entity.RouteState; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.stereotype.Repository; + +import javax.annotation.PostConstruct; +import java.util.Map; +import java.util.logging.Level; + +@Repository +@ConditionalOnBean(CacheFactory.class) +public class RouteRepository implements ICacheRepository { + private static final Logger logger = LoggerFactory.getLogger(); + + public ICache getCache() { + return cache; + } + + private ICache cache; + + @Autowired + public RouteRepository (CacheFactory cacheFactory) { + cache = cacheFactory.getCache(RouteState.class); + } + + @PostConstruct + private void init() { + logger.log(Level.INFO, "RouteRepository init completed"); + } + + @Override + public RouteState findItem(String id) throws CacheException { + return cache.get(id); + } + + @Override + public Map findAllItems() throws CacheException { + return cache.getAll(); + } + + @Override + public void addItem(RouteState routeState) throws CacheException { + logger.log(Level.INFO, "Add route, route Id:" + routeState.getId()); + cache.put(routeState.getId(), routeState); + } + + @Override + public void deleteItem(String id) throws CacheException { + logger.log(Level.INFO, "Delete route, route Id:" + id); + cache.remove(id); + } +} diff --git a/services/route_manager/src/main/java/com/futurewei/alcor/route/entity/RouteConstant.java b/services/route_manager/src/main/java/com/futurewei/alcor/route/entity/RouteConstant.java new file mode 100644 index 00000000..0cd61f96 --- /dev/null +++ b/services/route_manager/src/main/java/com/futurewei/alcor/route/entity/RouteConstant.java @@ -0,0 +1,9 @@ +package com.futurewei.alcor.route.entity; + +public interface RouteConstant { + final String DEFAULT_TARGET = "Local"; + + final Integer DEFAULT_PRIORITY = 0; + + final RouteTableType DEFAULT_ROUTE_TABLE_TYPE = RouteTableType.MAIN; +} diff --git a/services/route_manager/src/main/java/com/futurewei/alcor/route/entity/RouteState.java b/services/route_manager/src/main/java/com/futurewei/alcor/route/entity/RouteState.java new file mode 100644 index 00000000..e07b968d --- /dev/null +++ b/services/route_manager/src/main/java/com/futurewei/alcor/route/entity/RouteState.java @@ -0,0 +1,39 @@ +package com.futurewei.alcor.route.entity; + +import com.futurewei.alcor.common.entity.CustomerResource; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class RouteState extends CustomerResource { + + @NotNull + private String destination; + + @NotNull + private String target; + + @NotNull + private Integer priority; + + @NotNull + private RouteTableType associatedType; + + @NotNull + private String associatedTableId; + + public RouteState() { + + } + + public RouteState(String projectId, String Id, String name, String description, + String destination, String target, Integer priority, RouteTableType type, String tableId) { + super(projectId, Id, name, ""); + this.destination = destination; + this.target = target; + this.priority = priority; + this.associatedType = type; + this.associatedTableId = tableId; + } +} diff --git a/services/route_manager/src/main/java/com/futurewei/alcor/route/entity/RouteStateJson.java b/services/route_manager/src/main/java/com/futurewei/alcor/route/entity/RouteStateJson.java new file mode 100644 index 00000000..aa5ef6df --- /dev/null +++ b/services/route_manager/src/main/java/com/futurewei/alcor/route/entity/RouteStateJson.java @@ -0,0 +1,23 @@ +package com.futurewei.alcor.route.entity; + +import lombok.Data; + +@Data +public class RouteStateJson { + + private RouteState route; + + public RouteStateJson () {} + + public RouteStateJson (RouteState routeState) { + this.route = routeState; + } + + public RouteState getRoute() { + return route; + } + + public void setRoute(RouteState route) { + this.route = route; + } +} diff --git a/services/route_manager/src/main/java/com/futurewei/alcor/route/entity/RouteTableType.java b/services/route_manager/src/main/java/com/futurewei/alcor/route/entity/RouteTableType.java new file mode 100644 index 00000000..a5916b52 --- /dev/null +++ b/services/route_manager/src/main/java/com/futurewei/alcor/route/entity/RouteTableType.java @@ -0,0 +1,13 @@ +package com.futurewei.alcor.route.entity; + +public enum RouteTableType { + + // Main route table + MAIN, + + // Customer route table + CUSTOM, + + // Gateway route table + GATEWAY +} diff --git a/vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/entity/VpcState.java b/services/route_manager/src/main/java/com/futurewei/alcor/route/entity/VpcState.java similarity index 96% rename from vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/entity/VpcState.java rename to services/route_manager/src/main/java/com/futurewei/alcor/route/entity/VpcState.java index ce224be5..92003108 100644 --- a/vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/entity/VpcState.java +++ b/services/route_manager/src/main/java/com/futurewei/alcor/route/entity/VpcState.java @@ -14,7 +14,7 @@ limitations under the License. */ -package com.futurewei.alcor.vpcmanager.entity; +package com.futurewei.alcor.route.entity; import com.futurewei.alcor.common.entity.CustomerResource; import lombok.Data; diff --git a/services/route_manager/src/main/java/com/futurewei/alcor/route/entity/VpcStateJson.java b/services/route_manager/src/main/java/com/futurewei/alcor/route/entity/VpcStateJson.java new file mode 100644 index 00000000..d6eb9952 --- /dev/null +++ b/services/route_manager/src/main/java/com/futurewei/alcor/route/entity/VpcStateJson.java @@ -0,0 +1,40 @@ +/* +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. +*/ +package com.futurewei.alcor.route.entity; + +import lombok.Data; + +@Data +public class VpcStateJson { + private VpcState vpc; + + public VpcStateJson() { + + } + + public VpcStateJson(VpcState vpcState) { + this.vpc = vpcState; + } + + public VpcState getVpc() { + return vpc; + } + + public void setVpc(VpcState vpc) { + this.vpc = vpc; + } +} + diff --git a/services/route_manager/src/main/java/com/futurewei/alcor/route/service/RedisPublisher.java b/services/route_manager/src/main/java/com/futurewei/alcor/route/service/RedisPublisher.java new file mode 100644 index 00000000..2af27be1 --- /dev/null +++ b/services/route_manager/src/main/java/com/futurewei/alcor/route/service/RedisPublisher.java @@ -0,0 +1,46 @@ +/* +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. +*/ + +package com.futurewei.alcor.route.service; + +import com.futurewei.alcor.common.repo.ICachePublisher; +import com.futurewei.alcor.route.entity.RouteState; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.listener.ChannelTopic; +import org.springframework.stereotype.Service; + +@Service +public class RedisPublisher implements ICachePublisher { + + @Autowired + private RedisTemplate redisTemplate; + + @Autowired + private ChannelTopic topic; + + public RedisPublisher() { + } + + public RedisPublisher(final RedisTemplate redisTemplate, final ChannelTopic topic) { + this.redisTemplate = redisTemplate; + this.topic = topic; + } + + public void publish(final String message) { + redisTemplate.convertAndSend(topic.getTopic(), message); + } +} diff --git a/services/route_manager/src/main/java/com/futurewei/alcor/route/utils/RestPreconditionsUtil.java b/services/route_manager/src/main/java/com/futurewei/alcor/route/utils/RestPreconditionsUtil.java new file mode 100644 index 00000000..88ffb8ef --- /dev/null +++ b/services/route_manager/src/main/java/com/futurewei/alcor/route/utils/RestPreconditionsUtil.java @@ -0,0 +1,66 @@ +package com.futurewei.alcor.route.utils; + +import com.futurewei.alcor.common.entity.CustomerResource; +import com.futurewei.alcor.common.exception.*; +import com.futurewei.alcor.route.entity.RouteState; +import org.thymeleaf.util.StringUtils; + +public class RestPreconditionsUtil { + public static T verifyResourceFound(T resource) throws ResourceNotFoundException { + if (resource == null) throw new ResourceNotFoundException(); + + //TODO: Check resource exists in the repo + + return resource; + } + + public static T verifyResourceNotExists(T resource) throws ResourcePreExistenceException { + if (resource == null) throw new ResourcePreExistenceException(); + + //TODO: Check resource does not exist in the repo + + return resource; + } + + public static void verifyResourceNotNull(CustomerResource resource) throws ResourceNullException { + if (resource == null || StringUtils.isEmpty(resource.getId())) { + throw new ResourceNullException("Empty resource id"); + } + } + + public static void verifyParameterNotNullorEmpty(String resourceId) throws ParameterNullOrEmptyException { + if (StringUtils.isEmpty(resourceId)) { + throw new ParameterNullOrEmptyException("Empty parameter"); + } + } + + public static void verifyParameterEqual(String expectedResourceId, String resourceId) throws ParameterUnexpectedValueException { + if (StringUtils.isEmpty(resourceId) || !resourceId.equalsIgnoreCase(expectedResourceId)) { + throw new ParameterUnexpectedValueException("Expeceted value: " + expectedResourceId + " | actual: " + resourceId); + } + } + + public static void populateResourceProjectId(CustomerResource resource, String projectId) { + String resourceProjectId = resource.getProjectId(); + if (StringUtils.isEmpty(resourceProjectId)) { + resource.setProjectId(projectId); + } else if (!resourceProjectId.equalsIgnoreCase(projectId)) { + System.out.println("Resource id not matched " + resourceProjectId + " : " + projectId); + resource.setProjectId(projectId); + } + } + + public static void populateResourceVpcId(CustomerResource resource, String vpcId) { + String resourceVpcId = null; + if (resource instanceof RouteState) { + resourceVpcId = resource.getId(); + } + + if (StringUtils.isEmpty(resourceVpcId)) { + resource.setId(vpcId); + } else if (!resourceVpcId.equalsIgnoreCase(vpcId)) { + System.out.println("Resource vpc id not matched " + resourceVpcId + " : " + vpcId); + resource.setId(vpcId); + } + } +} \ No newline at end of file diff --git a/services/route_manager/src/main/resources/application.properties b/services/route_manager/src/main/resources/application.properties new file mode 100644 index 00000000..1861249d --- /dev/null +++ b/services/route_manager/src/main/resources/application.properties @@ -0,0 +1,11 @@ +#server.port=8082 +#spring.redis.host=redisRoute +#spring.redis.host=redis2 +spring.redis.host=10.103.179.92 +spring.redis.port=6380 +#apache.kafka.address=172.17.0.1:9092 +#Logging configuration +logging.level.root=info +logging.level.org.springframework.web=info +logging.file.path=. +logging.type=file diff --git a/services/route_manager/src/test/java/com/futurewei/alcor/route/RouteApplicationTests.java b/services/route_manager/src/test/java/com/futurewei/alcor/route/RouteApplicationTests.java new file mode 100644 index 00000000..055edf58 --- /dev/null +++ b/services/route_manager/src/test/java/com/futurewei/alcor/route/RouteApplicationTests.java @@ -0,0 +1,13 @@ +package com.futurewei.alcor.route; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class RouteApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/vpcmanager/.gitignore b/services/vpc_manager/.gitignore similarity index 100% rename from vpcmanager/.gitignore rename to services/vpc_manager/.gitignore diff --git a/services/vpc_manager/.mvn/wrapper/MavenWrapperDownloader.java b/services/vpc_manager/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 00000000..a45eb6ba --- /dev/null +++ b/services/vpc_manager/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,118 @@ +/* + * Copyright 2007-present the original author or 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 + * + * https://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. + */ + +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if (mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if (mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if (!outputFile.getParentFile().exists()) { + if (!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/services/vpc_manager/.mvn/wrapper/maven-wrapper.jar b/services/vpc_manager/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054 GIT binary patch literal 50710 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 EfAhh=DF6Tf literal 0 HcmV?d00001 diff --git a/services/vpc_manager/.mvn/wrapper/maven-wrapper.properties b/services/vpc_manager/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..642d572c --- /dev/null +++ b/services/vpc_manager/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/vpcmanager/Dockerfile b/services/vpc_manager/Dockerfile similarity index 100% rename from vpcmanager/Dockerfile rename to services/vpc_manager/Dockerfile diff --git a/services/vpc_manager/mvnw b/services/vpc_manager/mvnw new file mode 100644 index 00000000..3c8a5537 --- /dev/null +++ b/services/vpc_manager/mvnw @@ -0,0 +1,322 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# 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 +# +# https://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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ]; then + + if [ -f /etc/mavenrc ]; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ]; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false +darwin=false +mingw=false +case "$(uname)" in +CYGWIN*) cygwin=true ;; +MINGW*) mingw=true ;; +Darwin*) + darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="$(/usr/libexec/java_home)" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ]; then + if [ -r /etc/gentoo-release ]; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +if [ -z "$M2_HOME" ]; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ]; do + ls=$(ls -ld "$PRG") + link=$(expr "$ls" : '.*-> \(.*\)$') + if expr "$link" : '/.*' >/dev/null; then + PRG="$link" + else + PRG="$(dirname "$PRG")/$link" + fi + done + + saveddir=$(pwd) + + M2_HOME=$(dirname "$PRG")/.. + + # make it fully qualified + M2_HOME=$(cd "$M2_HOME" && pwd) + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=$(cygpath --unix "$M2_HOME") + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --unix "$CLASSPATH") +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw; then + [ -n "$M2_HOME" ] && + M2_HOME="$( ( + cd "$M2_HOME" + pwd + ))" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="$( ( + cd "$JAVA_HOME" + pwd + ))" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="$(which javac)" + if [ -n "$javaExecutable" ] && ! [ "$(expr \"$javaExecutable\" : '\([^ ]*\)')" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=$(which readlink) + if [ ! $(expr "$readLink" : '\([^ ]*\)') = "no" ]; then + if $darwin; then + javaHome="$(dirname \"$javaExecutable\")" + javaExecutable="$(cd \"$javaHome\" && pwd -P)/javac" + else + javaExecutable="$(readlink -f \"$javaExecutable\")" + fi + javaHome="$(dirname \"$javaExecutable\")" + javaHome=$(expr "$javaHome" : '\(.*\)/bin') + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ]; then + if [ -n "$JAVA_HOME" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="$(which java)" + fi +fi + +if [ ! -x "$JAVACMD" ]; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ]; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ]; then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ]; do + if [ -d "$wdir"/.mvn ]; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=$( + cd "$wdir/.." + pwd + ) + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' <"$1")" + fi +} + +BASE_DIR=$(find_maven_basedir "$(pwd)") +if [ -z "$BASE_DIR" ]; then + exit 1 +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in wrapperUrl) + jarUrl="$value" + break + ;; + esac + done <"$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget >/dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl >/dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=$(cygpath --path --windows "$M2_HOME") + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --windows "$CLASSPATH") + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/services/vpc_manager/mvnw.cmd b/services/vpc_manager/mvnw.cmd new file mode 100644 index 00000000..c8d43372 --- /dev/null +++ b/services/vpc_manager/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/vpcmanager/pom.xml b/services/vpc_manager/pom.xml similarity index 97% rename from vpcmanager/pom.xml rename to services/vpc_manager/pom.xml index eba9ac34..831ef2a9 100644 --- a/vpcmanager/pom.xml +++ b/services/vpc_manager/pom.xml @@ -56,13 +56,6 @@ lombok 1.18.0 - - com.futurewei.alcor.common - alcor_common_lib - 0.1.0 - system - ${pom.basedir}/lib/alcor_common_lib-0.1.0-SNAPSHOT.jar - mysql mysql-connector-java @@ -119,6 +112,14 @@ + + + com.futurewei.alcor.common + AlcorCommonLib + 0.1.0-SNAPSHOT + compile + + diff --git a/vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/VpcManagerApplication.java b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/VpcManagerApplication.java similarity index 100% rename from vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/VpcManagerApplication.java rename to services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/VpcManagerApplication.java diff --git a/vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/config/ControllerConfig.java b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/config/ControllerConfig.java similarity index 100% rename from vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/config/ControllerConfig.java rename to services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/config/ControllerConfig.java diff --git a/vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/config/RedisConfiguration.java b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/config/RedisConfiguration.java similarity index 100% rename from vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/config/RedisConfiguration.java rename to services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/config/RedisConfiguration.java diff --git a/vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/controller/DebugController.java b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/controller/DebugController.java similarity index 100% rename from vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/controller/DebugController.java rename to services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/controller/DebugController.java diff --git a/vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/controller/DebugVpcController.java b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/controller/DebugVpcController.java similarity index 100% rename from vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/controller/DebugVpcController.java rename to services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/controller/DebugVpcController.java diff --git a/vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/controller/VpcController.java b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/controller/VpcController.java similarity index 84% rename from vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/controller/VpcController.java rename to services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/controller/VpcController.java index 28e1025e..09c34fbc 100644 --- a/vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/controller/VpcController.java +++ b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/controller/VpcController.java @@ -25,10 +25,16 @@ import com.futurewei.alcor.vpcmanager.entity.VpcState; import com.futurewei.alcor.vpcmanager.entity.VpcStateJson; import com.futurewei.alcor.vpcmanager.utils.RestPreconditionsUtil; +import com.futurewei.alcor.vpcmanager.entity.RouteWebJson; +import com.futurewei.alcor.vpcmanager.entity.RouteWebObject; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpEntity; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; +import org.springframework.web.client.RestTemplate; +import java.util.ArrayList; +import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -40,6 +46,8 @@ public class VpcController { @Autowired private VpcRedisRepository vpcRedisRepository; + private RestTemplate restTemplate = new RestTemplate(); + @RequestMapping( method = GET, value = {"/project/{projectid}/vpcs/{vpcid}", "/v4/{projectid}/vpcs/{vpcid}"}) @@ -86,6 +94,23 @@ public VpcStateJson createVpcState(@PathVariable String projectid, @RequestBody if (vpcState == null) { throw new ResourcePersistenceException(); } + + String routeManagerServiceUrl = "http://192.168.1.17:30003/vpcs/" + vpcState.getId() + "/routes"; // for kubernetes test + //String routeManagerServiceUrl = "http://192.168.137.1:8081/vpcs/" + vpcState.getId() + "/routes"; // for docker test + HttpEntity request = new HttpEntity<>(new VpcStateJson(vpcState)); + RouteWebJson response = restTemplate.postForObject(routeManagerServiceUrl, request, RouteWebJson.class); + + // add RouteWebObject + if (response != null) { + List routeWebObjectList = vpcState.getRoutes(); + if (routeWebObjectList == null) { + routeWebObjectList = new ArrayList<>(); + } + routeWebObjectList.add(response.getRoute()); + vpcState.setRoutes(routeWebObjectList); + } + this.vpcRedisRepository.addItem(vpcState); + } catch (ParameterNullOrEmptyException e) { throw new Exception(e); } catch (ResourceNullException e) { diff --git a/vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/dao/VpcRedisRepository.java b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/dao/VpcRedisRepository.java similarity index 100% rename from vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/dao/VpcRedisRepository.java rename to services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/dao/VpcRedisRepository.java diff --git a/vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/dao/VpcRepository.java b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/dao/VpcRepository.java similarity index 100% rename from vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/dao/VpcRepository.java rename to services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/dao/VpcRepository.java diff --git a/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/CustomerResource.java b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/CustomerResource.java new file mode 100644 index 00000000..11318a96 --- /dev/null +++ b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/CustomerResource.java @@ -0,0 +1,86 @@ +/* +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. +*/ + +package com.futurewei.alcor.vpcmanager.entity; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class CustomerResource implements Serializable { + + @JsonProperty("project_id") + private String projectId; + + @JsonProperty("id") + private String id; + + @JsonProperty("name") + private String name; + + @JsonProperty("description") + private String description; + + public CustomerResource() { + + } + + public CustomerResource(CustomerResource state) { + this(state.projectId, state.id, state.name, state.description); + } + + public CustomerResource(String projectId, String id, String name, String description) { + this.projectId = projectId; + this.id = id; + this.name = name; + this.description = description; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } +} + diff --git a/vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/entity/DebugInfo.java b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/DebugInfo.java similarity index 100% rename from vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/entity/DebugInfo.java rename to services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/DebugInfo.java diff --git a/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/RouteTableType.java b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/RouteTableType.java new file mode 100644 index 00000000..f09564ea --- /dev/null +++ b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/RouteTableType.java @@ -0,0 +1,29 @@ +/* +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. +*/ + +package com.futurewei.alcor.vpcmanager.entity; + +public enum RouteTableType { + + // Main route table + MAIN, + + // Customer route table + CUSTOM, + + // Gateway route table + GATEWAY +} \ No newline at end of file diff --git a/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/RouteWebJson.java b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/RouteWebJson.java new file mode 100644 index 00000000..e03493c3 --- /dev/null +++ b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/RouteWebJson.java @@ -0,0 +1,40 @@ +/* +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. +*/ + +package com.futurewei.alcor.vpcmanager.entity; + +import lombok.Data; + +@Data +public class RouteWebJson { + + private RouteWebObject route; + + public RouteWebJson() { + } + + public RouteWebJson(RouteWebObject route) { + this.route = route; + } + + public RouteWebObject getRoute() { + return route; + } + + public void setRoute(RouteWebObject route) { + this.route = route; + } +} diff --git a/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/RouteWebObject.java b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/RouteWebObject.java new file mode 100644 index 00000000..a6cec055 --- /dev/null +++ b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/RouteWebObject.java @@ -0,0 +1,93 @@ +/* +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. +*/ + +package com.futurewei.alcor.vpcmanager.entity; + +import lombok.Data; +import org.jetbrains.annotations.NotNull; + +@Data +public class RouteWebObject extends CustomerResource { + + @NotNull + private String destination; + + @NotNull + private String target; + + @NotNull + private Integer priority; + + @NotNull + private RouteTableType associatedType; + + @NotNull + private String associatedTableId; + + public RouteWebObject() { + + } + + public RouteWebObject(String projectId, String Id, String name, String description, + String destination, String target, Integer priority, RouteTableType type, String tableId) { + super(projectId, Id, name, ""); + this.destination = destination; + this.target = target; + this.priority = priority; + this.associatedType = type; + this.associatedTableId = tableId; + } + + public String getDestination() { + return destination; + } + + public void setDestination(String destination) { + this.destination = destination; + } + + public String getTarget() { + return target; + } + + public void setTarget(String target) { + this.target = target; + } + + public Integer getPriority() { + return priority; + } + + public void setPriority(Integer priority) { + this.priority = priority; + } + + public RouteTableType getAssociatedType() { + return associatedType; + } + + public void setAssociatedType(RouteTableType associatedType) { + this.associatedType = associatedType; + } + + public String getAssociatedTableId() { + return associatedTableId; + } + + public void setAssociatedTableId(String associatedTableId) { + this.associatedTableId = associatedTableId; + } +} diff --git a/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/VpcState.java b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/VpcState.java new file mode 100644 index 00000000..0ea3067d --- /dev/null +++ b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/VpcState.java @@ -0,0 +1,59 @@ +/* +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. +*/ + +package com.futurewei.alcor.vpcmanager.entity; + +import com.futurewei.alcor.common.entity.CustomerResource; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class VpcState extends CustomerResource { + + private String cidr; + + private List routes; + + public VpcState() { + } + + public VpcState(String projectId, String id, String name, String cidr, List routeWebObjectList) { + this(projectId, id, name, cidr, null, routeWebObjectList); + } + + public VpcState(VpcState state) { + this(state.getProjectId(), state.getId(), state.getName(), state.getCidr(), state.getDescription(), state.getRoutes()); + } + + public VpcState(String projectId, String id, String name, String cidr, String description, List routeWebObjectList) { + + super(projectId, id, name, description); + this.cidr = cidr; + this.routes = routeWebObjectList; + } + + public String getCidr() { + return cidr; + } + + public void setCidr(String cidr) { + this.cidr = cidr; + } +} + + diff --git a/vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/entity/VpcStateJson.java b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/VpcStateJson.java similarity index 100% rename from vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/entity/VpcStateJson.java rename to services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/entity/VpcStateJson.java diff --git a/vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/service/RedisPublisher.java b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/service/RedisPublisher.java similarity index 100% rename from vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/service/RedisPublisher.java rename to services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/service/RedisPublisher.java diff --git a/vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/utils/RestPreconditionsUtil.java b/services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/utils/RestPreconditionsUtil.java similarity index 100% rename from vpcmanager/src/main/java/com/futurewei/alcor/vpcmanager/utils/RestPreconditionsUtil.java rename to services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/utils/RestPreconditionsUtil.java diff --git a/vpcmanager/src/main/resources/application.properties b/services/vpc_manager/src/main/resources/application.properties similarity index 87% rename from vpcmanager/src/main/resources/application.properties rename to services/vpc_manager/src/main/resources/application.properties index 1129dd27..e0459f58 100644 --- a/vpcmanager/src/main/resources/application.properties +++ b/services/vpc_manager/src/main/resources/application.properties @@ -1,9 +1,10 @@ #Machine configuration #VPCManager.machine.config=classpath:.\\config\\machine.json #Connecton configuration -spring.redis.host=alcor-redis +#spring.redis.host=alcor-redis +spring.redis.host=redis2 # Please check redis pod service cluster IP -#spring.redis.host=10.99.0.27 +#spring.redis.host=10.109.127.248 spring.redis.port=6379 apache.kafka.address=172.17.0.1:9092 #Logging configuration diff --git a/vpcmanager/src/main/resources/templates/start.html b/services/vpc_manager/src/main/resources/templates/start.html similarity index 78% rename from vpcmanager/src/main/resources/templates/start.html rename to services/vpc_manager/src/main/resources/templates/start.html index 21f4d117..641f7c23 100644 --- a/vpcmanager/src/main/resources/templates/start.html +++ b/services/vpc_manager/src/main/resources/templates/start.html @@ -5,6 +5,6 @@ Start -VPC Manager Module is running + VPC Manager Module is running \ No newline at end of file diff --git a/vpcmanager/src/test/java/com/futurewei/alcor/vpcmanager/VpcManagerApplicationTests.java b/services/vpc_manager/src/test/java/com/futurewei/alcor/vpcmanager/VpcManagerApplicationTests.java similarity index 100% rename from vpcmanager/src/test/java/com/futurewei/alcor/vpcmanager/VpcManagerApplicationTests.java rename to services/vpc_manager/src/test/java/com/futurewei/alcor/vpcmanager/VpcManagerApplicationTests.java diff --git a/vpcmanager/kubernetes/vpc-manager-redis-pod.yaml b/vpcmanager/kubernetes/vpc-manager-redis-pod.yaml deleted file mode 100644 index 416a9692..00000000 --- a/vpcmanager/kubernetes/vpc-manager-redis-pod.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: vpc-manager-redis -spec: - containers: - - name: vpc-manager - image: zhonghaolyu/repo:test - imagePullPolicy: IfNotPresent - ports: - - containerPort: 8080 - hostPort: 8081 - - name: redis - image: redis - imagePullPolicy: IfNotPresent - ports: - - containerPort: 8080 - hostPort: 6379 \ No newline at end of file diff --git a/vpcmanager/lib/alcor_common_lib-0.1.0-SNAPSHOT.jar b/vpcmanager/lib/alcor_common_lib-0.1.0-SNAPSHOT.jar deleted file mode 100644 index b69f5a443df6127989cd535f53143f97ca4dfb31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 57551 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 F`+spTowNV| diff --git a/web/src/main/java/com/futurewei/alcor/web/entity/RouteTableType.java b/web/src/main/java/com/futurewei/alcor/web/entity/RouteTableType.java new file mode 100644 index 00000000..e433beb1 --- /dev/null +++ b/web/src/main/java/com/futurewei/alcor/web/entity/RouteTableType.java @@ -0,0 +1,29 @@ +/* +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. +*/ + +package com.futurewei.alcor.web.entity; + +public enum RouteTableType { + + // Main route table + MAIN, + + // Customer route table + CUSTOM, + + // Gateway route table + GATEWAY +} \ No newline at end of file diff --git a/web/src/main/java/com/futurewei/alcor/web/entity/RouteWebJson.java b/web/src/main/java/com/futurewei/alcor/web/entity/RouteWebJson.java new file mode 100644 index 00000000..eb4892cf --- /dev/null +++ b/web/src/main/java/com/futurewei/alcor/web/entity/RouteWebJson.java @@ -0,0 +1,32 @@ +/* +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. +*/ + +package com.futurewei.alcor.web.entity; + +import lombok.Data; + +@Data +public class RouteWebJson { + + private RouteWebObject route; + + public RouteWebJson() { + } + + public RouteWebJson(RouteWebObject route) { + this.route = route; + } +} diff --git a/web/src/main/java/com/futurewei/alcor/web/entity/RouteWebObject.java b/web/src/main/java/com/futurewei/alcor/web/entity/RouteWebObject.java new file mode 100644 index 00000000..a0d59a77 --- /dev/null +++ b/web/src/main/java/com/futurewei/alcor/web/entity/RouteWebObject.java @@ -0,0 +1,53 @@ +/* +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. +*/ + +package com.futurewei.alcor.web.entity; + +import lombok.Data; +import org.jetbrains.annotations.NotNull; + +@Data +public class RouteWebObject extends CustomerResource { + + @NotNull + private String destination; + + @NotNull + private String target; + + @NotNull + private Integer priority; + + @NotNull + private RouteTableType associatedType; + + @NotNull + private String associatedTableId; + + public RouteWebObject() { + + } + + public RouteWebObject(String projectId, String Id, String name, String description, + String destination, String target, Integer priority, RouteTableType type, String tableId) { + super(projectId, Id, name, ""); + this.destination = destination; + this.target = target; + this.priority = priority; + this.associatedType = type; + this.associatedTableId = tableId; + } +} diff --git a/web/src/main/java/com/futurewei/alcor/web/entity/VpcWebObject.java b/web/src/main/java/com/futurewei/alcor/web/entity/VpcWebObject.java index 1f99bf5b..3516489f 100644 --- a/web/src/main/java/com/futurewei/alcor/web/entity/VpcWebObject.java +++ b/web/src/main/java/com/futurewei/alcor/web/entity/VpcWebObject.java @@ -18,34 +18,31 @@ import lombok.Data; +import java.util.List; + @Data public class VpcWebObject extends CustomerResource { private String cidr; + private List routes; + public VpcWebObject() { } - public VpcWebObject(String projectId, String id, String name, String cidr) { - this(projectId, id, name, cidr, null); + public VpcWebObject(String projectId, String id, String name, String cidr, List routeWebObjectList) { + this(projectId, id, name, cidr, null, routeWebObjectList); } public VpcWebObject(VpcWebObject state) { - this(state.getProjectId(), state.getId(), state.getName(), state.getCidr(), state.getDescription()); + this(state.getProjectId(), state.getId(), state.getName(), state.getCidr(), state.getDescription(), state.getRoutes()); } - public VpcWebObject(String projectId, String id, String name, String cidr, String description) { + public VpcWebObject(String projectId, String id, String name, String cidr, String description, List routeWebObjectList) { super(projectId, id, name, description); this.cidr = cidr; - } - - public String getCidr() { - return cidr; - } - - public void setCidr(String cidr) { - this.cidr = cidr; + this.routes = routeWebObjectList; } }