GutoVeronezi commented on a change in pull request #5873:
URL: https://github.com/apache/cloudstack/pull/5873#discussion_r792579311
##########
File path: server/src/main/java/com/cloud/network/NetworkServiceImpl.java
##########
@@ -2021,10 +2016,20 @@ public boolean deleteNetwork(long networkId, boolean
forced) {
@Override
@ActionEvent(eventType = EventTypes.EVENT_NETWORK_RESTART,
eventDescription = "restarting network", async = true)
public boolean restartNetwork(Long networkId, boolean cleanup, boolean
makeRedundant, User user) throws ConcurrentOperationException,
ResourceUnavailableException, InsufficientCapacityException {
+ NetworkVO network = getNetworkVO(networkId, "Network with specified id
doesn't exist", networkId.toString());
+ return restartNetwork(network, cleanup, makeRedundant, user);
+ }
+
+ private NetworkVO getNetworkVO(Long networkId, String s, String s2) {
Review comment:
Could we rename the second and third parameter to a more intuitive name?
##########
File path: server/src/main/java/com/cloud/network/NetworkServiceImpl.java
##########
@@ -2065,10 +2071,14 @@ public boolean restartNetwork(Long networkId, boolean
cleanup, boolean makeRedun
public boolean restartNetwork(RestartNetworkCmd cmd) throws
ConcurrentOperationException, ResourceUnavailableException,
InsufficientCapacityException {
// This method restarts all network elements belonging to the network
and re-applies all the rules
Long networkId = cmd.getNetworkId();
+ NetworkVO network = getNetworkVO(cmd.getNetworkId(),"Nework to restart
not found %s", String.valueOf(networkId));
Review comment:
```suggestion
NetworkVO network = getNetworkVO(cmd.getNetworkId(), "Network to
restart not found %s.", String.valueOf(networkId));
```
##########
File path: server/src/main/java/com/cloud/network/NetworkServiceImpl.java
##########
@@ -2065,10 +2071,14 @@ public boolean restartNetwork(Long networkId, boolean
cleanup, boolean makeRedun
public boolean restartNetwork(RestartNetworkCmd cmd) throws
ConcurrentOperationException, ResourceUnavailableException,
InsufficientCapacityException {
// This method restarts all network elements belonging to the network
and re-applies all the rules
Long networkId = cmd.getNetworkId();
+ NetworkVO network = getNetworkVO(cmd.getNetworkId(),"Nework to restart
not found %s", String.valueOf(networkId));
boolean cleanup = cmd.getCleanup();
+ if (network.getVpcId() != null && cleanup) {
+ throwInvalidIdException("Cannot restart a VPC tier with cleanup,
please restart the whole VPC", network.getUuid(), "network tier");
Review comment:
```suggestion
throwInvalidIdException("Cannot restart a VPC tier with cleanup,
please restart the whole VPC.", network.getUuid(), "network tier");
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
