[Alcor Integration]Port CURD - Bug Fix and New Route Manager APIs #253

kevin-zhonghao · 2020-06-17T01:17:45Z

This PR proposes the following changes:

Optimized route manager service and added route with subnet/vpc related database tables
Modified issue in port manager
Successfully tested e2e integration

…thController into docs/design

… integration_fix

xieus

@kevin-zhonghao Left a few comments. Please take a look.

xieus · 2020-06-29T23:12:54Z

kubernetes/services/sg_manager.yaml

+              - key: application.properties
+                path: application.properties
+      containers:
+        - image: zhonghaolyu/repo:sgKube1


We will need to add one more step of pushing container image to the "official" container registry in the CI workflow (for every PR merge) so that this yaml file could pull the latest "official" image.

Create an issue ##270 for tracking.

Sure ~ when CI is finished, I'll change it

xieus · 2020-06-29T23:14:21Z

kubernetes/services/sg_manager.yaml

+        - image: zhonghaolyu/repo:sgKube1
+        #- image: fwnetworking/controller:node_manager-v0.3.0
+          name: sgmanager-web
+          imagePullPolicy: IfNotPresent


How big is the image? We could want to change the policy to alwaysPull.

About several hundreds MB

xieus · 2020-06-29T23:15:20Z

kubernetes/services/sg_manager.yaml

+  labels:
+    name: sgmanager-service
+spec:
+  type: NodePort


ClusterIP or NodePort? Let us discuss.

services/port_manager/src/main/resources/application.properties

xieus · 2020-06-29T23:22:00Z

services/route_manager/src/main/java/com/futurewei/alcor/route/controller/RouteController.java

            method = GET,
-            value = {"/vpcs/{vpcId}/routes/{routeId}"})
-    public RouteWebJson getRuleByVpcId(@PathVariable String vpcId, @PathVariable String routeId) throws Exception {
+            value = {"routes/vpcs/{vpcId}/get"})


@kevin-zhonghao We may need to change the API doc if any.

It seems we didn't have route API doc right now, I will add it after

...r/src/main/java/com/futurewei/alcor/route/service/Impl/RouteWithSubnetMapperServiceImpl.java

xieus · 2020-06-29T23:42:20Z

...r/src/main/java/com/futurewei/alcor/route/service/Impl/RouteWithSubnetMapperServiceImpl.java

+
+    @Override
+    public void addMapperByRouteEntity(String subnetId, RouteEntity routeEntity) throws DatabasePersistenceException {
+        try {


In Route Manager ServiceImpl and repo classes, I don't find usage of a transaction.

Please find the reference implementation:

alcor/services/port_manager/src/main/java/com/futurewei/alcor/portmanager/repo/PortRepository.java

Line 66 in 7c6f138

public void createPortAndNeighbor(PortEntity portEntity, NeighborInfo neighborInfo) throws Exception {

@kevin-zhonghao

Create a ticket for tracking #274

...ager/src/main/java/com/futurewei/alcor/route/service/Impl/RouteWithVpcMapperServiceImpl.java

web/pom.xml

# Conflicts: # README.md # docs/modules/ROOT/pages/comm_protocol/fast_path.adoc # docs/modules/ROOT/pages/comm_protocol/rescue_path.adoc # docs/modules/ROOT/pages/controller.adoc # docs/modules/ROOT/pages/db_services/data_store.adoc # docs/modules/ROOT/pages/deploy_related/integration_nova.adoc # docs/modules/ROOT/pages/high_level/system_flow.adoc # docs/modules/ROOT/pages/mgmt_services/private_ip_manager.adoc # docs/modules/ROOT/pages/mgmt_services/security_group_manager.adoc # docs/modules/ROOT/pages/mgmt_services/virtual_mac_manager.adoc # docs/modules/ROOT/pages/mgmt_services/vpc_manager.adoc # docs/modules/ROOT/pages/sys_monitoring/monitoring.adoc

…into integration sync up the commit.

# Conflicts: # README.md # docs/modules/ROOT/pages/comm_protocol/fast_path.adoc # docs/modules/ROOT/pages/comm_protocol/rescue_path.adoc # docs/modules/ROOT/pages/controller.adoc # docs/modules/ROOT/pages/db_services/data_store.adoc # docs/modules/ROOT/pages/deploy_related/deployment.adoc # docs/modules/ROOT/pages/deploy_related/integration_nova.adoc # docs/modules/ROOT/pages/high_level/system_flow.adoc # docs/modules/ROOT/pages/mgmt_services/private_ip_manager.adoc # docs/modules/ROOT/pages/mgmt_services/security_group_manager.adoc # docs/modules/ROOT/pages/mgmt_services/virtual_mac_manager.adoc # docs/modules/ROOT/pages/mgmt_services/vpc_manager.adoc # docs/modules/ROOT/pages/sys_monitoring/monitoring.adoc

…o new_master

…into integration

xieus

LGTM.

xieus · 2020-07-02T23:54:07Z

...ort_manager/src/main/java/com/futurewei/alcor/portmanager/util/NetworkConfigurationUtil.java

                if (!subnetUniqueIds.contains(subnetId)) {
-                    Long tunnelId = subnetEntity.getTenantId() != null ? Long.valueOf(subnetEntity.getTenantId()) : null;
+                    // FIXME ：subnetEntity.getVpcId().hashCode() need to be changed to segmentId
+                    Long tunnelId = getTunnelId(subnetEntity);


Add a new issue for tracking #275

xieus · 2020-07-03T00:09:49Z

...te_manager/src/main/java/com/futurewei/alcor/route/service/RouteWithSubnetMapperService.java

+
+public interface RouteWithSubnetMapperService {
+
+    public SubnetToRouteMapper getBySubnetId (String subnetId) throws ResourceNotFoundException, ResourcePersistenceException;


Add comments if possible.

xieus · 2020-07-03T00:14:39Z

web/src/main/java/com/futurewei/alcor/web/entity/route/SubnetToRouteMapper.java

+    @JsonProperty("route_ids")
+    private List<String> routeIds;
+
+    @CreatedDate


Think of moving these two to a common resource class.

xieus · 2020-07-03T00:16:11Z

web/src/main/java/com/futurewei/alcor/web/restclient/RouteManagerRestClient.java

-        RouteWebJson routeWebJson = restTemplate.getForObject(url, RouteWebJson.class);
-        if (routeWebJson == null) {
+    public RoutesWebJson getRouteBySubnetId(String subnetId) throws Exception {
+        String url = routeManagerUrl + "/subnets/" + subnetId + "/get";


Url usually doesn't come with /get

xieus and others added 30 commits September 30, 2019 18:24

Update design documents and table of content

d745b47

Update README.md

1fc253e

Add cloud-native key word

9b0efb6

Merge branch 'docs/design' of https://github.com/futurewei-cloud/Alio…

db0a699

…thController into docs/design

Start docs for comm and controller

424dd5b

Add design sketch

b41edb9

Design spec round 1

3e54c57

Rename fast path file and start feature comparison

d7d8ad9

Update rescue path doc [DRAFT]

4c6588e

upload rescue_path.GIF

cceaa68

update rescue path needed change table

9785656

rescue_path.GIF

3e2b63e

rescue_path.adoc

f8fc472

Design spec round 2

2480dd1

Monitoring design outline

68eda0b

Update comm docs

c1c9cc7

Update data storage design

79e91fe

Merge branch 'docs/design' of https://github.com/futurewei-cloud/Alio…

ca69892

…thController into docs/design

Update data store

8b154ab

Complete review of existing dbs

4561d1e

Update review table

ca4610e

Adjust table column width

24b4a36

Update feature comparsion table

45774da

Finalize review section in data store

18e500c

Add design diagram

cc99d14

Add a design diagram

a9c8232

Add files via upload

2823921

fix "design" session level

47b7e45

Update monitoring.adoc

8c9c004

Update monitoring.adoc

4180450

kevin-zhonghao and others added 7 commits June 23, 2020 21:37

Merge branch 'fix/pm_del_port' of https://github.com/xieus/alcor into…

26f0a93

… integration_fix

Formating a few PM files

d4d9d1b

Remove redundant neighbor_info for ports on the same host

9a996a2

Fix PortRepository constructor

a758e18

Merge branch 'fix/pm_del_port' of https://github.com/xieus/alcor into…

b38ebcf

… integration_fix

update

f4bc675

Merge branch 'master' into integration

d4cc86d

xieus suggested changes Jun 29, 2020

View reviewed changes

xieus changed the title ~~[E2E Integration] Port CURD - Bug Fix and New Route Manager APIs~~ [Alcor Integration] Port CURD - Bug Fix and New Route Manager APIs Jul 2, 2020

kevin-zhonghao and others added 17 commits July 2, 2020 11:47

fix comments

e0ab106

sync up

f83248d

sync up

5085ddf

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

bc85346

…into integration sync up the commit.

Merge branch 'new_master' into integration

411ef56

sync up

f7ccaf4

sync up last version

3bb82d7

sync up last last version

55ccb4b

Merge branch 'master' into integration

6a02778

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

f6d42f2

…o new_master

sync up

4f8f842

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

535715a

…into integration

Merge branch 'new_master' into integration

d96a07a

update

32827c1

update

9b5abb9

xieus approved these changes Jul 3, 2020

View reviewed changes

xieus changed the title ~~[Alcor Integration] Port CURD - Bug Fix and New Route Manager APIs~~ [Alcor Integration]Port CURD - Bug Fix and New Route Manager APIs Jul 3, 2020

xieus merged commit 297255f into futurewei-cloud:master Jul 3, 2020

kevin-zhonghao deleted the integration branch July 7, 2020 17:58


		public interface RouteWithSubnetMapperService {

		public SubnetToRouteMapper getBySubnetId (String subnetId) throws ResourceNotFoundException, ResourcePersistenceException;

[Alcor Integration]Port CURD - Bug Fix and New Route Manager APIs #253

[Alcor Integration]Port CURD - Bug Fix and New Route Manager APIs #253

Uh oh!

Conversation

kevin-zhonghao commented Jun 17, 2020 • edited by xieus Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xieus left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

xieus left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

kevin-zhonghao commented Jun 17, 2020 •

edited by xieus

Loading