forked from apache/cloudstack
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This introduces a new encryption mode, instead of a simple bool. Now also storage driver can just provide encrypted volumes to CloudStack.
- Loading branch information
Showing
6 changed files
with
204 additions
and
27 deletions.
There are no files selected for viewing
This file contains 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 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 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 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 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
87 changes: 87 additions & 0 deletions
87
...org/apache/cloudstack/storage/datastore/driver/LinstorPrimaryDataStoreDriverImplTest.java
This file contains 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,87 @@ | ||
| // 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.storage.datastore.driver; | ||
|
|
||
| import com.linbit.linstor.api.ApiException; | ||
| import com.linbit.linstor.api.DevelopersApi; | ||
| import com.linbit.linstor.api.model.AutoSelectFilter; | ||
| import com.linbit.linstor.api.model.LayerType; | ||
| import com.linbit.linstor.api.model.ResourceGroup; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| import org.junit.Assert; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.mockito.InjectMocks; | ||
| import org.mockito.junit.MockitoJUnitRunner; | ||
|
|
||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| @RunWith(MockitoJUnitRunner.class) | ||
| public class LinstorPrimaryDataStoreDriverImplTest { | ||
|
|
||
| private DevelopersApi api; | ||
|
|
||
| @InjectMocks | ||
| private LinstorPrimaryDataStoreDriverImpl linstorPrimaryDataStoreDriver; | ||
|
|
||
| @Before | ||
| public void setUp() { | ||
| api = mock(DevelopersApi.class); | ||
| } | ||
|
|
||
| @Test | ||
| public void testGetEncryptedLayerList() throws ApiException { | ||
| ResourceGroup dfltRscGrp = new ResourceGroup(); | ||
| dfltRscGrp.setName("DfltRscGrp"); | ||
|
|
||
| ResourceGroup bCacheRscGrp = new ResourceGroup(); | ||
| bCacheRscGrp.setName("BcacheGrp"); | ||
| AutoSelectFilter asf = new AutoSelectFilter(); | ||
| asf.setLayerStack(Arrays.asList(LayerType.DRBD.name(), LayerType.BCACHE.name(), LayerType.STORAGE.name())); | ||
| asf.setStoragePool("nvmePool"); | ||
| bCacheRscGrp.setSelectFilter(asf); | ||
|
|
||
| ResourceGroup encryptedGrp = new ResourceGroup(); | ||
| encryptedGrp.setName("EncryptedGrp"); | ||
| AutoSelectFilter asf2 = new AutoSelectFilter(); | ||
| asf2.setLayerStack(Arrays.asList(LayerType.DRBD.name(), LayerType.LUKS.name(), LayerType.STORAGE.name())); | ||
| asf2.setStoragePool("ssdPool"); | ||
| encryptedGrp.setSelectFilter(asf2); | ||
|
|
||
| when(api.resourceGroupList(Collections.singletonList("DfltRscGrp"), Collections.emptyList(), null, null)) | ||
| .thenReturn(Collections.singletonList(dfltRscGrp)); | ||
| when(api.resourceGroupList(Collections.singletonList("BcacheGrp"), Collections.emptyList(), null, null)) | ||
| .thenReturn(Collections.singletonList(bCacheRscGrp)); | ||
| when(api.resourceGroupList(Collections.singletonList("EncryptedGrp"), Collections.emptyList(), null, null)) | ||
| .thenReturn(Collections.singletonList(encryptedGrp)); | ||
|
|
||
| List<LayerType> layers = linstorPrimaryDataStoreDriver.getEncryptedLayerList(api, "DfltRscGrp"); | ||
| Assert.assertEquals(Arrays.asList(LayerType.DRBD, LayerType.LUKS, LayerType.STORAGE), layers); | ||
|
|
||
| layers = linstorPrimaryDataStoreDriver.getEncryptedLayerList(api, "BcacheGrp"); | ||
| Assert.assertEquals(Arrays.asList(LayerType.DRBD, LayerType.BCACHE, LayerType.LUKS, LayerType.STORAGE), layers); | ||
|
|
||
| layers = linstorPrimaryDataStoreDriver.getEncryptedLayerList(api, "EncryptedGrp"); | ||
| Assert.assertEquals(Arrays.asList(LayerType.DRBD, LayerType.LUKS, LayerType.STORAGE), layers); | ||
| } | ||
| } |