mirror of
https://github.com/apache/cloudstack
synced 2026-08-08 07:47:32 +00:00
1a6df6f978
Design Document: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Allow+VM+listing+by+User+ID - Adds column to VMInstance DAO - Adds column in vm_instance table - Adds column in the UserVMJoinVO - Adds default admin user which has UID = 2 - Adds migration path that sets user_id to first user of the accountId that owns the vm in vm_instance table - Add arg on list VMs API to query by userId, add support in query layer - Refactor VMInstanceVO and child classes to accept userId - Add code to let service layer pass userId if loggedIn user belongs to same account as the owner executing an API call or use first user from owner account - In case of CPVM and SSVM use system user ID - Fix unit tests and spring injections Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
70 lines
2.8 KiB
Java
70 lines
2.8 KiB
Java
// 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 com.cloud.vm.dao;
|
|
|
|
import javax.inject.Inject;
|
|
|
|
import junit.framework.TestCase;
|
|
|
|
import org.apache.commons.lang.RandomStringUtils;
|
|
import org.junit.Test;
|
|
|
|
import com.cloud.hypervisor.Hypervisor;
|
|
import com.cloud.vm.UserVmVO;
|
|
import com.cloud.vm.VirtualMachine;
|
|
|
|
public class UserVmDaoImplTest extends TestCase {
|
|
@Inject
|
|
UserVmDao dao;
|
|
|
|
public void makeAndVerifyEntry(Long vmId, String instanceName, String displayName, long templateId, boolean userdataFlag, Hypervisor.HypervisorType hypervisor,
|
|
long guestOsId, boolean haEnabled, boolean limitCpuUse, long domainId, long accountId, long serviceOfferingId, String name, Long diskOfferingId) {
|
|
|
|
dao.expunge(vmId);
|
|
String userdata;
|
|
|
|
if (userdataFlag) {
|
|
// Generate large userdata to simulate 32k of random string data for userdata submitted through HTTP POST requests.
|
|
userdata = RandomStringUtils.randomAlphanumeric(32 * 1024);
|
|
} else {
|
|
// Generate normal sized userdata to simulate 2k of random string data.
|
|
userdata = RandomStringUtils.randomAlphanumeric(2 * 1024);
|
|
}
|
|
|
|
// Persist the data.
|
|
UserVmVO vo =
|
|
new UserVmVO(vmId, instanceName, displayName, templateId, hypervisor, guestOsId, haEnabled, limitCpuUse, domainId, accountId, 1, serviceOfferingId, userdata,
|
|
name, diskOfferingId);
|
|
dao.persist(vo);
|
|
|
|
vo = dao.findById(vmId);
|
|
assert (vo.getType() == VirtualMachine.Type.User) : "Incorrect type " + vo.getType();
|
|
|
|
// Check whether the userdata matches what we generated.
|
|
assert (vo.getUserData().equals(userdata)) : "User data retrieved does not match userdata generated as input";
|
|
|
|
}
|
|
|
|
@Test
|
|
public void testPersist() {
|
|
Long vmId = 2222l;
|
|
makeAndVerifyEntry(vmId, "vm1", "vmdisp1", 1l, false, Hypervisor.HypervisorType.KVM, 1l, false, true, 1l, 1l, 1l, "uservm1", 1l);
|
|
makeAndVerifyEntry(vmId, "vm1", "vmdisp1", 1l, true, Hypervisor.HypervisorType.KVM, 1l, false, true, 1l, 1l, 1l, "uservm1", 1l);
|
|
}
|
|
|
|
}
|
