[Vpc/Subnet Manager] API Standardization, and Segment APIs #181

kevin-zhonghao · 2020-04-30T05:22:56Z

Code refactor and new features included in this PR:

Standardized VPC Manager and Subnet Manager with their properties and APIs
Add Segment module and new UTs
Add SegmentRange module and new UTs
Add NetworkVlanType, NetworkVxlanType, NetworkGreType entities in db
Implement Vlan , Vxlan and GRE module in Segment
Add design doc draft for VPC and Subnet manager
Add new APIs in route manager

Replace Redis with Apache Ignite for in memory cache and db (futurewei-cloud#129)

xieus

Some early feedback for the new iteration.

...s/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/controller/SegmentController.java

..._manager/src/main/java/com/futurewei/alcor/vpcmanager/controller/SegmentRangeController.java

web/src/main/java/com/futurewei/alcor/web/entity/NetworkSegmentRangeWebRequestJson.java

xieus · 2020-05-04T20:46:17Z

web/src/main/java/com/futurewei/alcor/web/entity/NetworkVxlanType.java

+    @JsonProperty("mtu")
+    private String mtu;
+
+    @JsonProperty("vlan_id")


This class is for VxLan, so the id should be "vxlan_id", instead of "vlan_id" :-)

I think this property is used to store the vlan_id related to vxlan ~ let us talk about it

I don't think we discussed this before.

xieus · 2020-05-04T20:47:59Z

Some API gateway UTs failed. See detailed here: https://jenkins.alkaidcloud.io/job/alcor-controller-pr-test/228/console

[�[1;34mINFO�[m] AlcorApiGateway .................................... �[1;31mFAILURE�[m [ 2.268 s]

We still need to fix the UT failure.

.../vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/controller/DebugVpcController.java

xieus

Left a few more comments. Vlan allocation looks better!

docs/design/vpc_manager.adoc

lib/pom.xml

lib/src/main/java/com/futurewei/alcor/common/constants/NetworkType.java

lib/src/main/java/com/futurewei/alcor/common/exception/InternalDbOperationException.java

xieus · 2020-05-07T03:21:11Z

...s/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/controller/SegmentController.java

+            if (NetworkTypeEnum.VXLAN.getNetworkType().equals(networkType)) {
+                key = segmentService.addVxlanEntity(segmentWebRequestObject.getId());
+            } else if (NetworkTypeEnum.VLAN.getNetworkType().equals(networkType)) {
+                key = segmentService.addVlanEntity(segmentWebRequestObject.getId(), networkTypeId, networkType);


Do we need the parameter of networkType in the addVlanEntity method?

xieus · 2020-05-07T03:50:15Z

services/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/service/SegmentService.java

+    public VlanKeyRequest allocateVlan(VlanKeyRequest request) throws Exception;
+    public VlanKeyRequest releaseVlan(String networkType, String rangeId, Long key) throws Exception;
+    public VlanKeyRequest getVlan(String networkType, String rangeId, Long key) throws Exception;
+    public NetworkVlanRangeRequest createRange(NetworkVlanRangeRequest request) throws Exception;


Ideally, the Segment Service could have a generic method name like addEntity(segmentId, segmentationId, networkType) so that it could have different implementation for various network types.

Yeah it looks better in structure ~ but if we have that in SegmentService, we maybe not implement three different implementations in SegmentServiceImpl

Three implementation would look fantastic. why not? :-)

web/src/main/java/com/futurewei/alcor/web/entity/NetworkVlanRange.java

web/src/main/java/com/futurewei/alcor/web/entity/NetworkVlanRangeRequest.java

web/src/main/java/com/futurewei/alcor/web/entity/SegmentWebResponseObject.java

web/src/main/java/com/futurewei/alcor/web/entity/VlanKeyAlloc.java

sync up

# Conflicts: # docs/design/vpc_manager.adoc

…o futurewei-cloud-master

xieus

A few more comments, most of them are minor. There is one issue we need to pay attention to: NetworkVlanRange/NetworkVxlanRange shouldn't include segment id. The schema appears not right.

lib/pom.xml

lib/src/main/java/com/futurewei/alcor/common/config/MockIgniteConfiguration.java

lib/src/main/java/com/futurewei/alcor/common/exception/NetworkKeyAllocNotFoundException.java

services/api_gateway/src/main/java/com/futurewei/alcor/apigateway/vpc/VpcWebConfiguration.java

...s/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/controller/SegmentController.java

xieus · 2020-05-13T04:29:06Z

...vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/service/SegmentDatabaseService.java

+
+import java.util.Map;
+
+public interface SegmentDatabaseService {


There is another service interface called "SegmentService" but it also deals with database access, right? In this case, we should use names that match what it is exactly?

A renaming suggestion:
(1) SegmentDatabaseService => SegmentManagementService
(2) SegmentService => SegmentKeyManagementService

Let's talk about it

...es/vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/utils/RestPreconditionsUtil.java

web/src/main/java/com/futurewei/alcor/web/entity/NetworkVlanRange.java

web/src/main/java/com/futurewei/alcor/web/entity/NetworkVlanType.java

web/src/main/java/com/futurewei/alcor/web/entity/NetworkVxlanRange.java

xieus

LGTM. Thanks for the point-to-point response to the comments.

kevin-zhonghao and others added 30 commits March 24, 2020 16:00

vpcmanager

a81d90c

vpc manager service update

93da5e4

Merge pull request #1 from futurewei-cloud/master

bb7c1ff

Replace Redis with Apache Ignite for in memory cache and db (futurewei-cloud#129)

vpc manager directory structure update

2b6a43f

common service and updated vpcmanager

49ad0b0

Rename directory name from Common-service to lib

c9935f1

Move lib files under com.futurewei.alcor.common

3f04333

fix package paths in lib

715675e

Rename package path to com.futurewei.alcor.vpcmanager

4de3c83

Update common jar and use latest package path in vpcmanager

8d2a24d

update vpc manager jar package name

84b4cd5

change Dockerfilr

0032855

delete useless file

510fe4a

Reformat some files in vpc manager

2d1cca8

Reformat files in common lib

b0a81d3

route manager codes and update vpc manager

0c06645

update vpc_manager.yaml, route_manager_yaml

bfd46bc

update

3a2c035

Delete unused files

a739a9c

Add get/create apis on route manager and post call from vpc to route

8e5549a

update vpc controller and vpcState

771dad7

Update gitignore to exclude logs file

d07ff34

Merge from alcor/master

a84ab72

Merge from vpcmanager to alcor.vpcmanager

e27b2fa

Remove lib jar and add dependency on pom

9070cd0

Remove lib jar and add dependency on pom for route manager

8874c73

update alcor route manager service and package name

0b58f59

Fix vpc manager duplicated UTs

b6c328f

redis-route.yaml

d11745b

Update setRouteWebObjectList

0ed002d

kevin-zhonghao and others added 3 commits April 30, 2020 23:27

Add Segment module and new UTs

cda453b

add segmentRange module and UTs

42e6fec

Merge branch 'master' of https://github.com/kevin-zhonghao/alcor

e892cfb

xieus reviewed May 4, 2020

View reviewed changes

Outline VPC/Subnet manager design docs

3df3d9c

xieus reviewed May 5, 2020

View reviewed changes

.../vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/controller/DebugVpcController.java Outdated Show resolved Hide resolved

xieus reviewed May 5, 2020

View reviewed changes

.../vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/controller/DebugVpcController.java Outdated Show resolved Hide resolved

xieus reviewed May 5, 2020

View reviewed changes

.../vpc_manager/src/main/java/com/futurewei/alcor/vpcmanager/controller/DebugVpcController.java Outdated Show resolved Hide resolved

network_vlan module update

65306b7

xieus suggested changes May 7, 2020

View reviewed changes

kevin-zhonghao and others added 8 commits May 7, 2020 20:49

Merge pull request #2 from futurewei-cloud/master

53890d8

sync up

Vxlan module update and solve comments issues

e74ef6f

Import API specs to design doc

776fd86

GRE module update

91d1ac6

Merge remote-tracking branch 'remotes/origin/master'

aaf6b95

# Conflicts: # docs/design/vpc_manager.adoc

Merge branch 'master' of https://github.com/futurewei-cloud/alcor int…

c31042d

…o futurewei-cloud-master

subnet and vpc design doc update, add new APIs in route manager

01db3e4

route manager UTs fixed issues

8ca1ea7

xieus mentioned this pull request May 12, 2020

[Microservice] Port Manager #180

Merged

Fixed issues mentioned in comments

66499ce

xieus suggested changes May 13, 2020

View reviewed changes

kevin-zhonghao added 2 commits May 13, 2020 00:03

Fix issues, add comments

e0b96b8

fix issues

294da70

xieus changed the title ~~[Vpc/Subnet Manager] Networking API Standardization~~ [Vpc/Subnet Manager] Networking API Standardization, and Segment APIs May 13, 2020

fix

1923706

xieus approved these changes May 13, 2020

View reviewed changes

xieus changed the title ~~[Vpc/Subnet Manager] Networking API Standardization, and Segment APIs~~ [Vpc/Subnet Manager] API Standardization, and Segment APIs May 13, 2020

xieus merged commit f88a67f into futurewei-cloud:master May 13, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Vpc/Subnet Manager] API Standardization, and Segment APIs #181

[Vpc/Subnet Manager] API Standardization, and Segment APIs #181

kevin-zhonghao commented Apr 30, 2020 •

edited by xieus

Loading

xieus left a comment

xieus May 4, 2020

kevin-zhonghao May 4, 2020

xieus May 12, 2020

xieus commented May 4, 2020

xieus left a comment

xieus May 7, 2020

kevin-zhonghao May 8, 2020

xieus May 7, 2020

kevin-zhonghao May 8, 2020

xieus May 13, 2020

xieus left a comment

xieus May 13, 2020

kevin-zhonghao May 13, 2020

xieus left a comment


		import java.util.Map;

		public interface SegmentDatabaseService {

[Vpc/Subnet Manager] API Standardization, and Segment APIs #181

[Vpc/Subnet Manager] API Standardization, and Segment APIs #181

Conversation

kevin-zhonghao commented Apr 30, 2020 • edited by xieus Loading

xieus left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

xieus commented May 4, 2020

xieus left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

xieus left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

xieus left a comment

Choose a reason for hiding this comment

kevin-zhonghao commented Apr 30, 2020 •

edited by xieus

Loading