[RM] Fix Issue#647 and Issue#654 #657
Conversation
There was a problem hiding this comment.
@kevin-zhonghao It seems like @DavidLiu506's PR#655 has most of change included in your PR. Please just review @DavidLiu506's PR, put your change in his PR, and discard your current PR.
Thanks.
| @@ -315,7 +315,7 @@ public RouteTableWebJson getVpcRouteTableById(@PathVariable String projectid, @P | |||
| method = GET, | |||
| value = {"/project/{projectid}/subnets/{subnetid}/routetable"}) | |||
| @DurationStatistics | |||
| public RouteTableWebJson getOrCreateSubnetRouteTable(@PathVariable String projectid, @PathVariable String subnetid) throws Exception { | |||
| public RouteTableWebJson getSubnetRouteTable(@PathVariable String projectid, @PathVariable String subnetid) throws Exception { | |||
There was a problem hiding this comment.
@kevin-zhonghao I think @DavidLiu506 also modify this function, please check his PR#655
| @@ -350,7 +350,7 @@ public RouteTableWebJson getOrCreateSubnetRouteTable(@PathVariable String projec | |||
| method = POST, | |||
| value = {"/project/{projectid}/subnets/{subnetid}/routetable"}) | |||
| @DurationStatistics | |||
| public RouteTableWebJson createNeutronSubnetRouteTable(@PathVariable String projectid, @PathVariable String subnetid, @RequestBody RouteTableWebJson resource) throws Exception { | |||
| public RouteTableWebJson createSubnetRouteTable(@PathVariable String projectid, @PathVariable String subnetid, @RequestBody RouteTableWebJson resource) throws Exception { | |||
There was a problem hiding this comment.
@kevin-zhonghao Please check PR#655
| @@ -378,7 +378,7 @@ public RouteTableWebJson createNeutronSubnetRouteTable(@PathVariable String proj | |||
| "0.0.0.0/0", null, 100, null, "192.168.0.1"); | |||
| routes.add(defaultRoute); | |||
|
|
|||
| routeTable = this.routerService.createNeutronSubnetRouteTable(projectid, subnetid, resource, routes); | |||
| routeTable = this.routerService.createSubnetRouteTable(projectid, subnetid, resource, routes); | |||
There was a problem hiding this comment.
@kevin-zhonghao Please remove the default route in line 377.
| routeTable = this.routeTableDatabaseService.getByRouteTableId(vpcDefaultRouteTableId); | ||
| return routeTable; | ||
| } else if (routeTableMap.size() > 1) { | ||
| if (routeTableMap.size() > 1) { |
There was a problem hiding this comment.
@kevin-zhonghao I think @DavidLiu506 has pretty much the same change in his PR. If most of the changes are already included in @DavidLiu506's PR, please just review @DavidLiu506's PR and discard your current PR.
|
This PR is already included in PR #655, we can close this PR. |
Fix Issue #647 :
and Issue #654 :