SystemVM optimizations #5831
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -52,4 +52,6 @@ public enum RedundantState { | |
| Long getVpcId(); | ||
|
|
||
| String getTemplateVersion(); | ||
|
|
||
| String getScriptsVersion(); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| // 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 | ||
| // | ||
| // 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 org.apache.cloudstack.api.command.admin.systemvm; | ||
|
|
||
| import com.cloud.event.EventTypes; | ||
| import com.cloud.user.Account; | ||
| import com.cloud.utils.Pair; | ||
| import com.cloud.vm.VirtualMachine; | ||
| import org.apache.cloudstack.acl.RoleType; | ||
| import org.apache.cloudstack.api.APICommand; | ||
| import org.apache.cloudstack.api.ApiConstants; | ||
| import org.apache.cloudstack.api.ApiErrorCode; | ||
| import org.apache.cloudstack.api.BaseAsyncCmd; | ||
| import org.apache.cloudstack.api.BaseCmd; | ||
| import org.apache.cloudstack.api.Parameter; | ||
| import org.apache.cloudstack.api.ServerApiException; | ||
| import org.apache.cloudstack.api.response.SuccessResponse; | ||
| import org.apache.cloudstack.api.response.SystemVmResponse; | ||
| import org.apache.cloudstack.context.CallContext; | ||
| import org.apache.log4j.Logger; | ||
|
|
||
| @APICommand(name = PatchSystemVMCmd.APINAME, description = "Attempts to live patch systemVMs - CPVM, SSVM ", | ||
| responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, | ||
| responseHasSensitiveInfo = false, authorized = { RoleType.Admin }, since = "4.17.0") | ||
| public class PatchSystemVMCmd extends BaseAsyncCmd { | ||
| public static final Logger s_logger = Logger.getLogger(PatchSystemVMCmd.class.getName()); | ||
| public static final String APINAME = "patchSystemVm"; | ||
|
|
||
| ///////////////////////////////////////////////////// | ||
| //////////////// API parameters ///////////////////// | ||
| ///////////////////////////////////////////////////// | ||
| @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = SystemVmResponse.class, | ||
| description = "patches systemVM - CPVM/SSVM with the specified ID") | ||
| private Long id; | ||
|
|
||
| @Parameter(name = ApiConstants.FORCED, type = CommandType.BOOLEAN, | ||
| description = "If true, initiates copy of scripts and restart of the agent, even if the scripts version matches." + | ||
| "To be used with ID parameter only") | ||
| private Boolean force; | ||
|
|
||
| ///////////////////////////////////////////////////// | ||
| /////////////////// Accessors /////////////////////// | ||
| ///////////////////////////////////////////////////// | ||
|
|
||
|
|
||
| public Long getId() { | ||
| return id; | ||
| } | ||
|
|
||
| public boolean isForced() { | ||
| return force != null && force; | ||
| } | ||
|
|
||
| ///////////////////////////////////////////////////// | ||
| /////////////// API Implementation/////////////////// | ||
| ///////////////////////////////////////////////////// | ||
|
|
||
| @Override | ||
| public String getEventType() { | ||
| return EventTypes.EVENT_LIVE_PATCH_SYSTEMVM; | ||
| } | ||
|
|
||
| @Override | ||
| public String getEventDescription() { | ||
| return String.format("Attempting to live patch System VM with Id: %s ", this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||
| } | ||
|
|
||
| @Override | ||
| public String getCommandName() { | ||
| return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; | ||
| } | ||
|
|
||
| @Override | ||
| public long getEntityOwnerId() { | ||
| Account account = CallContext.current().getCallingAccount(); | ||
| if (account != null) { | ||
| return account.getId(); | ||
| } | ||
|
|
||
| return Account.ACCOUNT_ID_SYSTEM; | ||
| } | ||
|
|
||
| @Override | ||
| public void execute() { | ||
| Pair<Boolean, String> patched = _mgr.patchSystemVM(this); | ||
| if (patched.first()) { | ||
| final SuccessResponse response = new SuccessResponse(getCommandName()); | ||
| response.setDisplayText(patched.second()); | ||
| setResponseObject(response); | ||
| } else { | ||
| throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, patched.second()); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| // 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 | ||
| // | ||
| // 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.A | ||
| package org.apache.cloudstack.api.command.admin.systemvm; | ||
|
|
||
| import com.cloud.server.ManagementService; | ||
| import com.cloud.user.Account; | ||
| import com.cloud.utils.Pair; | ||
| import org.apache.cloudstack.context.CallContext; | ||
| import org.junit.Assert; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.mockito.InjectMocks; | ||
| import org.mockito.Mock; | ||
| import org.mockito.Mockito; | ||
| import org.mockito.MockitoAnnotations; | ||
| import org.powermock.api.mockito.PowerMockito; | ||
| import org.powermock.core.classloader.annotations.PowerMockIgnore; | ||
| import org.powermock.core.classloader.annotations.PrepareForTest; | ||
| import org.powermock.modules.junit4.PowerMockRunner; | ||
| import org.springframework.test.util.ReflectionTestUtils; | ||
|
|
||
| @RunWith(PowerMockRunner.class) | ||
| @PrepareForTest(CallContext.class) | ||
| @PowerMockIgnore({"javax.xml.*", "org.w3c.dom.*", "org.apache.xerces.*", "org.xml.*"}) | ||
| public class PatchSystemVMCmdTest { | ||
|
|
||
| @Mock | ||
| private ManagementService _mgr; | ||
|
|
||
| @InjectMocks | ||
| PatchSystemVMCmd cmd = new PatchSystemVMCmd(); | ||
|
|
||
| @Before | ||
| public void setUp() throws Exception { | ||
| MockitoAnnotations.initMocks(this); | ||
| } | ||
|
|
||
| @Test | ||
| public void patchValidSystemVM() { | ||
| ReflectionTestUtils.setField(cmd, "id", 1L); | ||
| Pair successResponse = new Pair<>(true, ""); | ||
| Mockito.doReturn(successResponse).when(_mgr).patchSystemVM(cmd); | ||
| try { | ||
| cmd.execute(); | ||
| } catch (Exception e) { | ||
| e.printStackTrace(); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void patchInvalidSystemVM() { | ||
| ReflectionTestUtils.setField(cmd, "id", null); | ||
| Pair<Boolean, String> failureResponse = new Pair<>(false, "Please provide a valid ID of a system VM to be patched"); | ||
| Mockito.doReturn(failureResponse).when(_mgr).patchSystemVM(cmd); | ||
| try { | ||
| cmd.execute(); | ||
| } catch (Exception e) { | ||
| Assert.assertEquals(failureResponse.second(), e.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void validateArgsForPatchSystemVMApi() { | ||
| PowerMockito.mockStatic(CallContext.class); | ||
| CallContext callContextMock = PowerMockito.mock(CallContext.class); | ||
| PowerMockito.when(CallContext.current()).thenReturn(callContextMock); | ||
| Account accountMock = PowerMockito.mock(Account.class); | ||
| PowerMockito.when(callContextMock.getCallingAccount()).thenReturn(accountMock); | ||
| Mockito.when(accountMock.getId()).thenReturn(2L); | ||
| ReflectionTestUtils.setField(cmd, "id", 1L); | ||
| Assert.assertEquals((long)cmd.getId(), 1L); | ||
| Assert.assertFalse(cmd.isForced()); | ||
| Assert.assertEquals(cmd.getEntityOwnerId(), 2L); | ||
|
|
||
|
|
||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same comment as above, see comment for restart network cmd.