Skip to content

config: persist config subgroups with their name and group id #14050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nagaboinaramgopal wants to merge 1 commit into
base: 4.20
Choose a base branch
from
Open

config: persist config subgroups with their name and group id #14050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...ork/config/src/main/java/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,8 @@ private void createOrupdateConfigObject(Date date, String componentName, ConfigK
Pair<String, Long> subGroup = key.subGroup();
ConfigurationSubGroupVO subGroupVO = _configSubGroupDao.findByNameAndGroup(subGroup.first(), groupId);
if (subGroupVO == null) {
subGroupVO = new ConfigurationSubGroupVO();
subGroupVO = new ConfigurationSubGroupVO(subGroup.first(), null, subGroup.second());
subGroupVO.setGroupId(groupId);
subGroupVO = _configSubGroupDao.persist(subGroupVO);
}
subGroupId = subGroupVO.getId();
Expand Down
30 changes: 30 additions & 0 deletions ...config/src/test/java/org/apache/cloudstack/framework/config/impl/ConfigDepotImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,54 @@

import org.apache.cloudstack.framework.config.ConfigKey;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.framework.config.dao.ConfigurationSubGroupDao;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;

import com.cloud.utils.Pair;

import java.util.Date;

@RunWith(MockitoJUnitRunner.class)
public class ConfigDepotImplTest {

@Mock
ConfigurationDao _configDao;

@Mock
ConfigurationSubGroupDao _configSubGroupDao;

@InjectMocks
private ConfigDepotImpl configDepotImpl = new ConfigDepotImpl();

@Test
public void createConfigObjectPersistsSubGroupWithNameAndGroupId() {
ConfigKey<?> key = Mockito.mock(ConfigKey.class);
Mockito.when(key.group()).thenReturn(null);
Mockito.when(key.subGroup()).thenReturn(new Pair<>("ConsoleProxy VM", 5L));
Mockito.when(key.key()).thenReturn("consoleproxy.capacity.standby");
Mockito.when(key.scope()).thenReturn(ConfigKey.Scope.Global);
Mockito.when(_configSubGroupDao.findByNameAndGroup("ConsoleProxy VM", 1L)).thenReturn(null);
Mockito.when(_configSubGroupDao.persist(Mockito.any(ConfigurationSubGroupVO.class)))
.thenAnswer(invocation -> invocation.getArgument(0));
Mockito.when(_configDao.findById("consoleproxy.capacity.standby")).thenReturn(Mockito.mock(ConfigurationVO.class));

ArgumentCaptor<ConfigurationSubGroupVO> captor = ArgumentCaptor.forClass(ConfigurationSubGroupVO.class);
ReflectionTestUtils.invokeMethod(configDepotImpl, "createOrupdateConfigObject",
new Date(), "components", key, "someValue");

Mockito.verify(_configSubGroupDao).persist(captor.capture());
Assert.assertEquals("ConsoleProxy VM", captor.getValue().getName());
Assert.assertEquals(Long.valueOf(1L), captor.getValue().getGroupId());
}

@Test
public void createEmptyScopeLevelMappingsTest() {
configDepotImpl.createEmptyScopeLevelMappings();
Expand Down
Loading