You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2013/12/30 08:57:45 UTC
git commit: updated refs/heads/master to 7f9683a
Updated Branches:
refs/heads/master 95fa931ff -> 7f9683af8
Added Virtual-Network and Virtual-Machine Model unit test.
Signed-off-by: Hugo Trippaers <ht...@schubergphilis.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7f9683af
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7f9683af
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7f9683af
Branch: refs/heads/master
Commit: 7f9683af859224b4aa0cae037acda063a9d1536e
Parents: 95fa931
Author: Sachchidanand Vaidya <va...@juniper.net>
Authored: Tue Dec 10 09:02:25 2013 -0800
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Mon Dec 30 08:57:21 2013 +0100
----------------------------------------------------------------------
.../contrail/management/ModelDatabase.java | 2 +-
.../contrail/model/VirtualMachineModel.java | 23 +++-
.../management/VirtualMachineModelTest.java | 128 +++++++++++++++++++
.../management/VirtualNetworkModelTest.java | 77 ++++++++++-
4 files changed, 222 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f9683af/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ModelDatabase.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ModelDatabase.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ModelDatabase.java
index 7f66a3b..e2845b7 100644
--- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ModelDatabase.java
+++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ModelDatabase.java
@@ -31,7 +31,7 @@ public class ModelDatabase {
TreeSet<VirtualMachineModel> _vmTable;
TreeSet<VirtualNetworkModel> _vnTable;
- ModelDatabase() {
+ public ModelDatabase() {
initDb();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f9683af/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java
index f571f89..df0af90 100644
--- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java
+++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java
@@ -337,8 +337,27 @@ public class VirtualMachineModel extends ModelObjectBase {
@Override
public boolean verify(ModelController controller) {
- // TODO Auto-generated method stub
- return false;
+ assert _initialized : "initialized is false";
+ assert _uuid != null : "uuid is not set";
+
+ ApiConnector api = controller.getApiAccessor();
+
+ try {
+ _vm = (VirtualMachine) api.findById(VirtualMachine.class, _uuid);
+ } catch (IOException e) {
+ s_logger.error("virtual-machine verify", e);
+ }
+
+ if (_vm == null) {
+ return false;
+ }
+
+ for (ModelObject successor: successors()) {
+ if (!successor.verify(controller)) {
+ return false;
+ }
+ }
+ return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f9683af/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/VirtualMachineModelTest.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/VirtualMachineModelTest.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/VirtualMachineModelTest.java
new file mode 100644
index 0000000..7b0a263
--- /dev/null
+++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/VirtualMachineModelTest.java
@@ -0,0 +1,128 @@
+package org.apache.cloudstack.network.contrail.model;
+import java.util.UUID;
+
+import java.io.IOException;
+
+import org.apache.cloudstack.network.contrail.management.*;
+import org.apache.cloudstack.network.contrail.model.*;
+
+import org.apache.log4j.Logger;
+import org.junit.runner.RunWith;
+
+import static org.mockito.Mockito.*;
+
+import com.cloud.network.Network;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.dao.UserVmDao;
+import com.cloud.uservm.UserVm;
+
+import net.juniper.contrail.api.ApiConnectorMock;
+import net.juniper.contrail.api.ApiConnectorFactory;
+import net.juniper.contrail.api.ApiObjectBase;
+import net.juniper.contrail.api.types.Domain;
+import net.juniper.contrail.api.types.InstanceIp;
+import net.juniper.contrail.api.types.NetworkIpam;
+import net.juniper.contrail.api.types.SubnetType;
+import net.juniper.contrail.api.types.VirtualMachineInterface;
+import net.juniper.contrail.api.types.VirtualNetwork;
+import net.juniper.contrail.api.types.VnSubnetsType;
+import net.juniper.contrail.api.types.NetworkPolicy;
+import net.juniper.contrail.api.types.Project;
+import net.juniper.contrail.api.types.FloatingIp;
+import net.juniper.contrail.api.types.VnSubnetsType;
+import net.juniper.contrail.api.types.ServiceInstance;
+import net.juniper.contrail.api.ApiConnector;
+
+import org.junit.runner.RunWith;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.AfterClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import junit.framework.TestCase;
+
+public class VirtualMachineModelTest extends TestCase {
+ private static final Logger s_logger =
+ Logger.getLogger(VirtualMachineModelTest.class);
+
+ @Test
+ public void testVirtualMachineDBLookup() {
+ ModelDatabase db = new ModelDatabase();
+ VMInstanceVO vm = mock(VMInstanceVO.class);
+
+ // Create 3 dummy Virtual Machine model objects
+ // Add these models to database.
+ // Each VM is identified by unique UUId.
+ VirtualMachineModel vm0 = new VirtualMachineModel(vm, "fbc1f8fa-4b78-45ee-bba0-b551dbf72353");
+ db.getVirtualMachines().add(vm0);
+
+ VirtualMachineModel vm1 = new VirtualMachineModel(vm, "fbc1f8fa-4b78-45ee-bba0-b551dbf83464");
+ db.getVirtualMachines().add(vm1);
+
+ VirtualMachineModel vm2 = new VirtualMachineModel(vm, "fbc1f8fa-4b78-45ee-bba0-b551dbf94575");
+ db.getVirtualMachines().add(vm2);
+
+ s_logger.debug("No of Vitual Machines added to database : " + db.getVirtualMachines().size());
+
+ assertEquals(3, db.getVirtualMachines().size());
+
+ assertSame(vm0, db.lookupVirtualMachine("fbc1f8fa-4b78-45ee-bba0-b551dbf72353"));
+ assertSame(vm1, db.lookupVirtualMachine("fbc1f8fa-4b78-45ee-bba0-b551dbf83464"));
+ assertSame(vm2, db.lookupVirtualMachine("fbc1f8fa-4b78-45ee-bba0-b551dbf94575"));
+ }
+
+ @Test
+ public void testCreateVirtualMachine() throws IOException {
+
+ String uuid = UUID.randomUUID().toString();
+ ContrailManagerImpl contrailMgr = mock(ContrailManagerImpl.class);
+ ModelController controller = mock(ModelController.class);
+ ApiConnector api = new ApiConnectorMock(null, 0);
+ when(controller.getManager()).thenReturn(contrailMgr);
+ when(controller.getApiAccessor()).thenReturn(api);
+
+ // Create Virtual-Network (VN)
+ NetworkVO network = mock(NetworkVO.class);
+ when(network.getName()).thenReturn("testnetwork");
+ when(network.getState()).thenReturn(Network.State.Allocated);
+ when(network.getGateway()).thenReturn("10.1.1.1");
+ when(network.getCidr()).thenReturn("10.1.1.0/24");
+ when(network.getPhysicalNetworkId()).thenReturn(42L);
+ when(network.getDomainId()).thenReturn(10L);
+ when(network.getAccountId()).thenReturn(42L);
+
+ when(contrailMgr.getCanonicalName(network)).thenReturn("testnetwork");
+ when(contrailMgr.getProjectId(network.getDomainId(), network.getAccountId())).thenReturn("testProjectId");
+
+ // Create Virtual-Machine (VM)
+ VMInstanceVO vm = mock(VMInstanceVO.class);
+ when(vm.getInstanceName()).thenReturn("testVM1");
+ when(vm.getState()).thenReturn(VirtualMachine.State.Starting);
+ when(vm.getDomainId()).thenReturn(10L);
+ when(vm.getAccountId()).thenReturn(42L);
+
+ UserVmDao VmDao = mock(UserVmDao.class);
+ when(VmDao.findById(anyLong())).thenReturn(null);
+ when(controller.getVmDao()).thenReturn(VmDao);
+
+ VirtualMachineModel vmModel = new VirtualMachineModel(vm, uuid);
+
+ assertEquals(vmModel.getInstanceName(), "testVM1");
+ assertEquals(vmModel.getUuid(), uuid);
+
+ vmModel.build(controller, vm);
+ try {
+ vmModel.update(controller);
+ } catch (Exception ex) {
+ fail("virtual-network update failed ");
+ }
+
+ //verify
+ assertTrue(vmModel.verify(controller));
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f9683af/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/VirtualNetworkModelTest.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/VirtualNetworkModelTest.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/VirtualNetworkModelTest.java
index 0938541..16949a4 100644
--- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/VirtualNetworkModelTest.java
+++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/VirtualNetworkModelTest.java
@@ -15,20 +15,49 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.cloudstack.network.contrail.management;
+package org.apache.cloudstack.network.contrail.model;
import java.util.UUID;
import junit.framework.TestCase;
+import javax.inject.Inject;
+import java.io.IOException;
+
+import org.apache.cloudstack.network.contrail.management.*;
import org.apache.log4j.Logger;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.apache.cloudstack.network.contrail.model.VirtualNetworkModel;
+import net.juniper.contrail.api.ApiConnectorMock;
+import net.juniper.contrail.api.ApiConnectorFactory;
+import net.juniper.contrail.api.ApiObjectBase;
+import net.juniper.contrail.api.types.Domain;
+import net.juniper.contrail.api.types.InstanceIp;
+import net.juniper.contrail.api.types.NetworkIpam;
+import net.juniper.contrail.api.types.SubnetType;
+import net.juniper.contrail.api.types.VirtualMachine;
+import net.juniper.contrail.api.types.VirtualMachineInterface;
+import net.juniper.contrail.api.types.VirtualNetwork;
+import net.juniper.contrail.api.types.VnSubnetsType;
+import net.juniper.contrail.api.types.NetworkPolicy;
+import net.juniper.contrail.api.types.Project;
+import net.juniper.contrail.api.types.FloatingIp;
+import net.juniper.contrail.api.types.VnSubnetsType;
+import net.juniper.contrail.api.types.ServiceInstance;
+import net.juniper.contrail.api.ApiConnector;
+
+import org.junit.runner.RunWith;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.AfterClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import static org.mockito.Mockito.*;
import com.cloud.network.Networks.TrafficType;
+import com.cloud.network.Network.State;
import com.cloud.network.dao.NetworkVO;
+import com.cloud.utils.component.ComponentContext;
public class VirtualNetworkModelTest extends TestCase {
private static final Logger s_logger = Logger.getLogger(VirtualNetworkModelTest.class);
@@ -36,7 +65,7 @@ public class VirtualNetworkModelTest extends TestCase {
@Test
public void testDBLookup() {
ModelDatabase db = new ModelDatabase();
- NetworkVO network = Mockito.mock(NetworkVO.class);
+ NetworkVO network = mock(NetworkVO.class);
VirtualNetworkModel storageModel = new VirtualNetworkModel(network, null, ContrailManager.managementNetworkName, TrafficType.Storage);
db.getVirtualNetworks().add(storageModel);
VirtualNetworkModel mgmtModel = new VirtualNetworkModel(network, null, ContrailManager.managementNetworkName, TrafficType.Management);
@@ -46,6 +75,7 @@ public class VirtualNetworkModelTest extends TestCase {
VirtualNetworkModel guestModel2 = new VirtualNetworkModel(network, UUID.randomUUID().toString(), "test", TrafficType.Guest);
db.getVirtualNetworks().add(guestModel2);
s_logger.debug("networks: " + db.getVirtualNetworks().size());
+ s_logger.debug("No of Vitual Networks added to database : " + db.getVirtualNetworks().size());
assertEquals(4, db.getVirtualNetworks().size());
assertSame(storageModel, db.lookupVirtualNetwork(null, storageModel.getName(), TrafficType.Storage));
assertSame(mgmtModel, db.lookupVirtualNetwork(null, mgmtModel.getName(), TrafficType.Management));
@@ -53,4 +83,41 @@ public class VirtualNetworkModelTest extends TestCase {
assertSame(guestModel2, db.lookupVirtualNetwork(guestModel2.getUuid(), null, TrafficType.Guest));
}
+ @Test
+ public void testCreateVirtualNetwork() throws IOException {
+
+ String uuid = UUID.randomUUID().toString();
+ ContrailManagerImpl contrailMgr = mock(ContrailManagerImpl.class);
+ ModelController controller = mock(ModelController.class);
+ ApiConnector api = new ApiConnectorMock(null, 0);
+ when(controller.getManager()).thenReturn(contrailMgr);
+ when(controller.getApiAccessor()).thenReturn(api);
+
+ // Create Virtual-Network (VN)
+ NetworkVO network = mock(NetworkVO.class);
+ when(network.getName()).thenReturn("testnetwork");
+ when(network.getState()).thenReturn(State.Allocated);
+ when(network.getGateway()).thenReturn("10.1.1.1");
+ when(network.getCidr()).thenReturn("10.1.1.0/24");
+ when(network.getPhysicalNetworkId()).thenReturn(42L);
+ when(network.getDomainId()).thenReturn(10L);
+ when(network.getAccountId()).thenReturn(42L);
+
+ when(contrailMgr.getCanonicalName(network)).thenReturn("testnetwork");
+ when(contrailMgr.getProjectId(network.getDomainId(), network.getAccountId())).thenReturn("testProjectId");
+
+ VirtualNetworkModel vnModel = new VirtualNetworkModel(network, uuid, "testnetwork", TrafficType.Guest);
+
+ assertEquals(vnModel.getName(), "testnetwork");
+ assertEquals(vnModel.getUuid(), uuid);
+
+ vnModel.build(controller, network);
+ try {
+ vnModel.update(controller);
+ } catch (Exception ex) {
+ fail("virtual-network update failed ");
+ }
+ assertTrue(vnModel.verify(controller));
+}
+
}