You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/12/12 22:01:07 UTC
[07/48] All Checkstyle problems corrected
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/test/async-job-component.xml
----------------------------------------------------------------------
diff --git a/server/test/async-job-component.xml b/server/test/async-job-component.xml
index 55f47cc..6c7a6e0 100644
--- a/server/test/async-job-component.xml
+++ b/server/test/async-job-component.xml
@@ -1,204 +1,191 @@
<?xml version="1.0"?>
-<!--
-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
+<!-- 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. -->
+<!-- components.xml is the configuration file for the VM Ops insertion servers. Someone
+ can quickly pull together an insertion server by selecting the correct adapters to
+ use. Here are some places to look for information. - To find out the general functionality
+ that each Manager or Adapter provide, look at the javadoc for the interface that
+ it implements. The interface is usually the "key" attribute in the declaration. -
+ To find specific implementation of each Manager or Adapter, look at the javadoc for
+ the actual class. The class can be found in the <class> element. - To find out the
+ configuration parameters for each Manager or Adapter, look at the javadoc for the
+ actual implementation class. It should be documented in the description of the class.
+ - To know more about the components.xml in general, look for the javadoc for ComponentLocator.java.
+ If you found that the Manager or Adapter are not properly documented, please contact
+ the author. -->
+<components.xml>
+ <management-server class="com.vmops.server.ManagementServerImpl">
+ <dao name="domain router" class="com.cloud.vm.dao.DomainRouterDaoImpl" />
+ <dao name="host" class="com.cloud.host.dao.HostDaoImpl" />
+ <dao name="VM Instance" class="com.cloud.vm.dao.VMInstanceDaoImpl" />
+ <dao name="User VM" class="com.cloud.vm.dao.UserVmDaoImpl" />
+ <dao name="ServiceOffering" class="com.cloud.service.dao.ServiceOfferingDaoImpl">
+ <param name="cache.size">50</param>
+ <param name="cache.time.to.live">-1</param>
+ </dao>
+ <dao name="DiskOffering" class="com.cloud.storage.dao.DiskOfferingDaoImpl" />
+ <dao name="VMDisk" class="com.cloud.storage.dao.VmDiskDaoImpl" />
+ <dao name="host zone" class="com.cloud.dc.dao.DataCenterDaoImpl">
+ <param name="cache.size">50</param>
+ <param name="cache.time.to.live">-1</param>
+ </dao>
+ <dao name="host pod" class="com.cloud.dc.dao.HostPodDaoImpl">
+ <param name="cache.size">50</param>
+ <param name="cache.time.to.live">-1</param>
+ </dao>
+ <dao name="vlan" class="com.cloud.dc.dao.VlanDaoImpl">
+ </dao>
+ <dao name="Volume" class="com.cloud.storage.dao.VolumeDaoImpl" />
+ <dao name="Events" class="com.cloud.event.dao.EventDaoImpl" />
+ <dao name="VM Template" class="com.cloud.storage.dao.VMTemplateDaoImpl">
+ <param name="cache.size">50</param>
+ <param name="cache.time.to.live">-1</param>
+ <param name="routing.uniquename">routing</param>
+ </dao>
+ <dao name="User" class="com.cloud.user.dao.UserDaoImpl">
+ <param name="cache.size">5000</param>
+ <param name="cache.time.to.live">300</param>
+ </dao>
+ <dao name="UserStats" class="com.cloud.user.dao.UserStatisticsDaoImpl" />
+ <dao name="VmDiskStats" class="com.cloud.user.dao.VmDiskStatisticsDaoImpl" />
+ <dao name="Disk Template" class="com.cloud.storage.dao.DiskTemplateDaoImpl">
+ <param name="cache.size">50</param>
+ <param name="cache.time.to.live">-1</param>
+ </dao>
+ <dao name="Firewall Rules" class="com.cloud.network.dao.FirewallRulesDaoImpl" />
+ <dao name="Security Group" class="com.cloud.network.dao.SecurityGroupDaoImpl" />
+ <dao name="Load Balancer" class="com.cloud.network.dao.LoadBalancerDaoImpl" />
+ <dao name="Network Rule Config" class="com.cloud.network.dao.NetworkRuleConfigDaoImpl" />
+ <dao name="Security Group Mapping" class="com.cloud.network.dao.SecurityGroupVMMapDaoImpl" />
+ <dao name="Load Balancer Mapping" class="com.cloud.network.dao.LoadBalancerVMMapDaoImpl" />
+ <dao name="IP Addresses" class="com.cloud.network.dao.IPAddressDaoImpl" />
+ <dao name="Datacenter IP Addresses" class="com.cloud.dc.dao.DataCenterIpAddressDaoImpl" />
+ <dao name="Pricing" class="com.cloud.pricing.dao.PricingDaoImpl" />
+ <dao name="Usage" class="com.cloud.usage.dao.UsageDaoImpl" />
+ <dao name="UsageJob" class="com.cloud.usage.dao.UsageJobDaoImpl" />
+ <dao name="Alert" class="com.cloud.alert.dao.AlertDaoImpl" />
+ <dao name="Capacity" class="com.cloud.capacity.dao.CapacityDaoImpl" />
+ <dao name="Domain" class="com.cloud.domain.dao.DomainDaoImpl" />
+ <dao name="Account" class="com.cloud.user.dao.AccountDaoImpl" />
+ <dao name="Limit" class="com.cloud.configuration.dao.LimitDaoImpl" />
+ <dao name="UserAccount" class="com.cloud.user.dao.UserAccountDaoImpl" />
+ <dao name="Usage IPAddress" class="com.cloud.usage.dao.UsageIPAddressDaoImpl" />
+ <dao name="VM Template Host" class="com.cloud.storage.dao.VMTemplateHostDaoImpl" />
+ <dao name="VM Template Swift" class="com.cloud.storage.dao.VMTemplateSwiftDaoImpl" />
+ <dao name="Upload" class="com.cloud.storage.dao.UploadDaoImpl" />
+ <dao name="VM Template Pool" class="com.cloud.storage.dao.VMTemplatePoolDaoImpl" />
+ <dao name="Launch Permission" class="com.cloud.storage.dao.LaunchPermissionDaoImpl" />
+ <dao name="Configuration" class="com.cloud.configuration.dao.ConfigurationDaoImpl" />
+ <dao name="HA" class="com.cloud.ha.dao.HighAvailabilityDaoImpl" />
+ <dao name="Console Proxy" class="com.cloud.vm.dao.ConsoleProxyDaoImpl" />
+ <dao name="Upgrade" class="com.cloud.maint.dao.AgentUpgradeDaoImpl" />
+ <dao name="Management Server Host" class="com.cloud.cluster.dao.ManagementServerHostDaoImpl" />
+ <dao name="Snapshot" class="com.cloud.storage.dao.SnapshotDaoImpl" />
+ <dao name="ScheduledVMBackup" class="com.cloud.user.dao.ScheduledVMBackupDaoImpl" />
+ <dao name="AsyncJobDao" class="com.cloud.async.dao.AsyncJobDaoImpl" />
+ <dao name="SyncQueueDao" class="com.cloud.async.dao.SyncQueueDaoImpl" />
+ <dao name="SyncQueueItemDao" class="com.cloud.async.dao.SyncQueueItemDaoImpl" />
+ <dao name="GuestOSDao" class="com.cloud.storage.dao.GuestOSDaoImpl" />
- http://www.apache.org/licenses/LICENSE-2.0
+ <dao name="StoragePoolDao" class="com.cloud.storage.dao.StoragePoolDaoImpl" />
+ <dao name="StoragePoolHostDao" class="com.cloud.storage.dao.StoragePoolHostDaoImpl" />
+ <dao name="HostDetails" class="com.cloud.host.dao.DetailsDaoImpl" />
-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.
--->
-<!--
- components.xml is the configuration file for the VM Ops
- insertion servers. Someone can quickly pull together an
- insertion server by selecting the correct adapters to use.
- Here are some places to look for information.
- - To find out the general functionality that each Manager
- or Adapter provide, look at the javadoc for the interface
- that it implements. The interface is usually the
- "key" attribute in the declaration.
- - To find specific implementation of each Manager or
- Adapter, look at the javadoc for the actual class. The
- class can be found in the <class> element.
- - To find out the configuration parameters for each Manager
- or Adapter, look at the javadoc for the actual implementation
- class. It should be documented in the description of the
- class.
- - To know more about the components.xml in general, look for
- the javadoc for ComponentLocator.java.
- If you found that the Manager or Adapter are not properly
- documented, please contact the author.
--->
-<components.xml>
- <management-server class="com.vmops.server.ManagementServerImpl">
- <dao name="domain router" class="com.cloud.vm.dao.DomainRouterDaoImpl"/>
- <dao name="host" class="com.cloud.host.dao.HostDaoImpl"/>
- <dao name="VM Instance" class="com.cloud.vm.dao.VMInstanceDaoImpl"/>
- <dao name="User VM" class="com.cloud.vm.dao.UserVmDaoImpl"/>
- <dao name="ServiceOffering" class="com.cloud.service.dao.ServiceOfferingDaoImpl">
- <param name="cache.size">50</param>
- <param name="cache.time.to.live">-1</param>
- </dao>
- <dao name="DiskOffering" class="com.cloud.storage.dao.DiskOfferingDaoImpl"/>
- <dao name="VMDisk" class="com.cloud.storage.dao.VmDiskDaoImpl"/>
- <dao name="host zone" class="com.cloud.dc.dao.DataCenterDaoImpl">
- <param name="cache.size">50</param>
- <param name="cache.time.to.live">-1</param>
- </dao>
- <dao name="host pod" class="com.cloud.dc.dao.HostPodDaoImpl">
- <param name="cache.size">50</param>
- <param name="cache.time.to.live">-1</param>
- </dao>
- <dao name="vlan" class="com.cloud.dc.dao.VlanDaoImpl">
- </dao>
- <dao name="Volume" class="com.cloud.storage.dao.VolumeDaoImpl"/>
- <dao name="Events" class="com.cloud.event.dao.EventDaoImpl"/>
- <dao name="VM Template" class="com.cloud.storage.dao.VMTemplateDaoImpl">
- <param name="cache.size">50</param>
- <param name="cache.time.to.live">-1</param>
- <param name="routing.uniquename">routing</param>
- </dao>
- <dao name="User" class="com.cloud.user.dao.UserDaoImpl">
- <param name="cache.size">5000</param>
- <param name="cache.time.to.live">300</param>
- </dao>
- <dao name="UserStats" class="com.cloud.user.dao.UserStatisticsDaoImpl"/>
- <dao name="VmDiskStats" class="com.cloud.user.dao.VmDiskStatisticsDaoImpl"/>
- <dao name="Disk Template" class="com.cloud.storage.dao.DiskTemplateDaoImpl">
- <param name="cache.size">50</param>
- <param name="cache.time.to.live">-1</param>
- </dao>
- <dao name="Firewall Rules" class="com.cloud.network.dao.FirewallRulesDaoImpl"/>
- <dao name="Security Group" class="com.cloud.network.dao.SecurityGroupDaoImpl"/>
- <dao name="Load Balancer" class="com.cloud.network.dao.LoadBalancerDaoImpl"/>
- <dao name="Network Rule Config" class="com.cloud.network.dao.NetworkRuleConfigDaoImpl"/>
- <dao name="Security Group Mapping" class="com.cloud.network.dao.SecurityGroupVMMapDaoImpl"/>
- <dao name="Load Balancer Mapping" class="com.cloud.network.dao.LoadBalancerVMMapDaoImpl"/>
- <dao name="IP Addresses" class="com.cloud.network.dao.IPAddressDaoImpl"/>
- <dao name="Datacenter IP Addresses" class="com.cloud.dc.dao.DataCenterIpAddressDaoImpl"/>
- <dao name="Pricing" class="com.cloud.pricing.dao.PricingDaoImpl"/>
- <dao name="Usage" class="com.cloud.usage.dao.UsageDaoImpl"/>
- <dao name="UsageJob" class="com.cloud.usage.dao.UsageJobDaoImpl"/>
- <dao name="Alert" class="com.cloud.alert.dao.AlertDaoImpl"/>
- <dao name="Capacity" class="com.cloud.capacity.dao.CapacityDaoImpl"/>
- <dao name="Domain" class="com.cloud.domain.dao.DomainDaoImpl"/>
- <dao name="Account" class="com.cloud.user.dao.AccountDaoImpl"/>
- <dao name="Limit" class="com.cloud.configuration.dao.LimitDaoImpl"/>
- <dao name="UserAccount" class="com.cloud.user.dao.UserAccountDaoImpl"/>
- <dao name="Usage IPAddress" class="com.cloud.usage.dao.UsageIPAddressDaoImpl"/>
- <dao name="VM Template Host" class="com.cloud.storage.dao.VMTemplateHostDaoImpl"/>
- <dao name="VM Template Swift" class="com.cloud.storage.dao.VMTemplateSwiftDaoImpl"/>
- <dao name="Upload" class="com.cloud.storage.dao.UploadDaoImpl"/>
- <dao name="VM Template Pool" class="com.cloud.storage.dao.VMTemplatePoolDaoImpl"/>
- <dao name="Launch Permission" class="com.cloud.storage.dao.LaunchPermissionDaoImpl"/>
- <dao name="Configuration" class="com.cloud.configuration.dao.ConfigurationDaoImpl"/>
- <dao name="HA" class="com.cloud.ha.dao.HighAvailabilityDaoImpl"/>
- <dao name="Console Proxy" class="com.cloud.vm.dao.ConsoleProxyDaoImpl"/>
- <dao name="Upgrade" class="com.cloud.maint.dao.AgentUpgradeDaoImpl"/>
- <dao name="Management Server Host" class="com.cloud.cluster.dao.ManagementServerHostDaoImpl"/>
- <dao name="Snapshot" class="com.cloud.storage.dao.SnapshotDaoImpl"/>
- <dao name="ScheduledVMBackup" class="com.cloud.user.dao.ScheduledVMBackupDaoImpl"/>
- <dao name="AsyncJobDao" class="com.cloud.async.dao.AsyncJobDaoImpl"/>
- <dao name="SyncQueueDao" class="com.cloud.async.dao.SyncQueueDaoImpl"/>
- <dao name="SyncQueueItemDao" class="com.cloud.async.dao.SyncQueueItemDaoImpl"/>
- <dao name="GuestOSDao" class="com.cloud.storage.dao.GuestOSDaoImpl"/>
-
- <dao name="StoragePoolDao" class="com.cloud.storage.dao.StoragePoolDaoImpl"/>
- <dao name="StoragePoolHostDao" class="com.cloud.storage.dao.StoragePoolHostDaoImpl"/>
- <dao name="HostDetails" class="com.cloud.host.dao.DetailsDaoImpl"/>
-
+ <adapters key="com.cloud.agent.manager.allocator.HostAllocator">
+ <adapter name="FirstFitRouting"
+ class="com.cloud.agent.manager.allocator.impl.FirstFitRoutingAllocator" />
+ <adapter name="FirstFit"
+ class="com.cloud.agent.manager.allocator.impl.FirstFitAllocator" />
+ </adapters>
+ <adapters key="com.cloud.agent.manager.allocator.StorageAllocator">
+ <adapter name="Storage"
+ class="com.cloud.agent.manager.allocator.impl.FirstFitStorageAllocator">
+ <param name="storage.overprovisioning.factor">2</param>
+ </adapter>
+ <adapter name="Storage"
+ class="com.cloud.agent.manager.allocator.impl.RandomStoragePoolAllocator">
+ <param name="storage.overprovisioning.factor">2</param>
+ </adapter>
+ </adapters>
+ <adapters key="com.cloud.agent.manager.allocator.PodAllocator">
+ <adapter name="User First"
+ class="com.cloud.agent.manager.allocator.impl.UserConcentratedAllocator" />
+ </adapters>
-
- <adapters key="com.cloud.agent.manager.allocator.HostAllocator">
- <adapter name="FirstFitRouting" class="com.cloud.agent.manager.allocator.impl.FirstFitRoutingAllocator"/>
- <adapter name="FirstFit" class="com.cloud.agent.manager.allocator.impl.FirstFitAllocator"/>
- </adapters>
- <adapters key="com.cloud.agent.manager.allocator.StorageAllocator">
- <adapter name="Storage" class="com.cloud.agent.manager.allocator.impl.FirstFitStorageAllocator">
- <param name="storage.overprovisioning.factor">2</param>
- </adapter>
- <adapter name="Storage" class="com.cloud.agent.manager.allocator.impl.RandomStoragePoolAllocator">
- <param name="storage.overprovisioning.factor">2</param>
- </adapter>
- </adapters>
- <adapters key="com.cloud.agent.manager.allocator.PodAllocator">
- <adapter name="User First" class="com.cloud.agent.manager.allocator.impl.UserConcentratedAllocator"/>
- </adapters>
+ <adapters key="com.cloud.consoleproxy.ConsoleProxyAllocator">
+ <adapter name="Balance"
+ class="com.cloud.consoleproxy.ConsoleProxyBalanceAllocator" />
+ </adapters>
- <adapters key="com.cloud.consoleproxy.ConsoleProxyAllocator">
- <adapter name="Balance" class="com.cloud.consoleproxy.ConsoleProxyBalanceAllocator"/>
- </adapters>
+ <adapters key="com.cloud.server.auth.UserAuthenticator">
+ <adapter name="MD5" class="com.cloud.server.auth.MD5UserAuthenticator" />
+ </adapters>
+ <adapters key="com.cloud.ha.Investigator">
+ <adapter name="SimpleInvestigator" class="com.cloud.ha.CheckOnAgentInvestigator" />
+ <adapter name="PingInvestigator" class="com.cloud.ha.InvestigatorImpl" />
+ </adapters>
+ <adapters key="com.cloud.ha.FenceBuilder">
+ <adapter name="StorageFenceBuilder" class="com.cloud.ha.StorageFence" />
+ </adapters>
+ <adapters key="com.cloud.cluster.ClusterServiceAdapter">
+ <adapter name="ClusterService" class="com.cloud.cluster.ClusterServiceServletAdapter" />
+ </adapters>
+ <adapters key="com.cloud.resource.Discoverer">
+ <adapter name="XenServer" class="com.cloud.resource.xen.XenServerDiscoverer" />
+ <adapter name="SecondaryStorage"
+ class="com.cloud.storage.secondary.SecondaryStorageDiscoverer" />
+ <adapter name="DummyHostServer" class="com.cloud.resource.DummyHostDiscoverer" />
+ </adapters>
+ <manager name="account manager" class="com.cloud.user.AccountManagerImpl">
+ </manager>
+ <manager name="agent manager" class="com.cloud.agent.manager.ClusteredAgentManagerImpl">
+ </manager>
+ <manager name="configuration manager" class="com.cloud.configuration.ConfigurationManagerImpl">
+ <param name="premium">true</param>
+ </manager>
+ <manager name="network manager" class="com.cloud.network.NetworkManagerImpl">
+ </manager>
+ <manager name="download manager" class="com.cloud.storage.download.DownloadMonitorImpl">
+ </manager>
+ <manager name="upload manager" class="com.cloud.storage.upload.UploadMonitorImpl">
+ </manager>
+ <manager name="console proxy manager" class="com.cloud.consoleproxy.ConsoleProxyManagerImpl">
+ </manager>
+ <manager name="vm manager" class="com.cloud.vm.UserVmManagerImpl" />
+ <manager name="upgrade manager" class="com.cloud.maint.UpgradeManagerImpl">
+ </manager>
+ <manager name="StorageManager" class="com.cloud.storage.StorageManagerImpl">
+ </manager>
+ <manager name="HA Manager" class="com.cloud.ha.HighAvailabilityManagerExtImpl">
+ </manager>
+ <manager name="Cluster Manager" class="com.cloud.cluster.ClusterManagerImpl">
+ </manager>
+ <manager name="SyncQueueManager" class="com.cloud.async.SyncQueueManagerImpl">
+ </manager>
+ <manager name="AsyncJobManager" class="com.cloud.async.AsyncJobManagerImpl">
+ </manager>
+ <manager name="AsyncJobExecutorContext" class="com.cloud.async.AsyncJobExecutorContextImpl">
+ </manager>
- <adapters key="com.cloud.server.auth.UserAuthenticator">
- <adapter name="MD5" class="com.cloud.server.auth.MD5UserAuthenticator"/>
- </adapters>
- <adapters key="com.cloud.ha.Investigator">
- <adapter name="SimpleInvestigator" class="com.cloud.ha.CheckOnAgentInvestigator"/>
- <adapter name="PingInvestigator" class="com.cloud.ha.InvestigatorImpl"/>
- </adapters>
- <adapters key="com.cloud.ha.FenceBuilder">
- <adapter name="StorageFenceBuilder" class="com.cloud.ha.StorageFence"/>
- </adapters>
- <adapters key="com.cloud.cluster.ClusterServiceAdapter">
- <adapter name="ClusterService" class="com.cloud.cluster.ClusterServiceServletAdapter"/>
- </adapters>
- <adapters key="com.cloud.resource.Discoverer">
- <adapter name="XenServer" class="com.cloud.resource.xen.XenServerDiscoverer"/>
- <adapter name="SecondaryStorage" class="com.cloud.storage.secondary.SecondaryStorageDiscoverer"/>
- <adapter name="DummyHostServer" class="com.cloud.resource.DummyHostDiscoverer"/>
- </adapters>
- <manager name="account manager" class="com.cloud.user.AccountManagerImpl">
- </manager>
- <manager name="agent manager" class="com.cloud.agent.manager.ClusteredAgentManagerImpl">
- </manager>
- <manager name="configuration manager" class="com.cloud.configuration.ConfigurationManagerImpl">
- <param name="premium">true</param>
- </manager>
- <manager name="network manager" class="com.cloud.network.NetworkManagerImpl">
- </manager>
- <manager name="download manager" class="com.cloud.storage.download.DownloadMonitorImpl">
- </manager>
- <manager name="upload manager" class="com.cloud.storage.upload.UploadMonitorImpl">
- </manager>
- <manager name="console proxy manager" class="com.cloud.consoleproxy.ConsoleProxyManagerImpl">
- </manager>
- <manager name="vm manager" class="com.cloud.vm.UserVmManagerImpl"/>
- <manager name="upgrade manager" class="com.cloud.maint.UpgradeManagerImpl">
- </manager>
- <manager name="StorageManager" class="com.cloud.storage.StorageManagerImpl">
- </manager>
- <manager name="HA Manager" class="com.cloud.ha.HighAvailabilityManagerExtImpl">
- </manager>
- <manager name="Cluster Manager" class="com.cloud.cluster.ClusterManagerImpl">
- </manager>
- <manager name="SyncQueueManager" class="com.cloud.async.SyncQueueManagerImpl">
- </manager>
- <manager name="AsyncJobManager" class="com.cloud.async.AsyncJobManagerImpl">
- </manager>
- <manager name="AsyncJobExecutorContext" class="com.cloud.async.AsyncJobExecutorContextImpl">
- </manager>
-
- <manager name="Alert Manager" class="com.cloud.alert.AlertManagerImpl">
- </manager>
- <manager name="Template Manager" class="com.cloud.template.TemplateManagerImpl">
- </manager>
- <adapters key="com.cloud.alert.AlertAdapter">
- <adapter name="ClusterAlert" class="com.cloud.alert.ClusterAlertAdapter"/>
- <adapter name="ConsoleProxyAlert" class="com.cloud.alert.ConsoleProxyAlertAdapter"/>
- </adapters>
- </management-server>
+ <manager name="Alert Manager" class="com.cloud.alert.AlertManagerImpl">
+ </manager>
+ <manager name="Template Manager" class="com.cloud.template.TemplateManagerImpl">
+ </manager>
+ <adapters key="com.cloud.alert.AlertAdapter">
+ <adapter name="ClusterAlert" class="com.cloud.alert.ClusterAlertAdapter" />
+ <adapter name="ConsoleProxyAlert" class="com.cloud.alert.ConsoleProxyAlertAdapter" />
+ </adapters>
+ </management-server>
</components.xml>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/test/com/cloud/capacity/CapacityManagerTest.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/capacity/CapacityManagerTest.java b/server/test/com/cloud/capacity/CapacityManagerTest.java
index b6cae6b..686089b 100644
--- a/server/test/com/cloud/capacity/CapacityManagerTest.java
+++ b/server/test/com/cloud/capacity/CapacityManagerTest.java
@@ -39,11 +39,11 @@ public class CapacityManagerTest {
ClusterDetailsDao ClusterDetailsDao = mock(com.cloud.dc.ClusterDetailsDao.class);
CapacityManagerImpl capMgr;
private ServiceOfferingVO svo = mock(ServiceOfferingVO.class);
- private CapacityVO cvo_cpu = mock(CapacityVO.class);
- private CapacityVO cvo_ram = mock(CapacityVO.class);
+ private CapacityVO cvoCpu = mock(CapacityVO.class);
+ private CapacityVO cvoRam = mock(CapacityVO.class);
private VirtualMachine vm = mock(VirtualMachine.class);
- private ClusterDetailsVO cluster_detail_cpu = mock(ClusterDetailsVO.class);
- private ClusterDetailsVO cluster_detail_ram = mock(ClusterDetailsVO.class);
+ private ClusterDetailsVO clusterDetailCpu = mock(ClusterDetailsVO.class);
+ private ClusterDetailsVO clusterDetailRam = mock(ClusterDetailsVO.class);
public CapacityManagerImpl setUp() {
CapacityManagerImpl capMgr = new CapacityManagerImpl();
@@ -59,18 +59,18 @@ public class CapacityManagerTest {
when(vm.getHostId()).thenReturn(1l);
when(vm.getServiceOfferingId()).thenReturn(2l);
when(SOfferingDao.findById(anyLong(), anyLong())).thenReturn(svo);
- when(CDao.findByHostIdType(anyLong(), eq(Capacity.CAPACITY_TYPE_CPU))).thenReturn(cvo_cpu);
- when(CDao.findByHostIdType(anyLong(), eq(Capacity.CAPACITY_TYPE_MEMORY))).thenReturn(cvo_ram);
- when(cvo_cpu.getUsedCapacity()).thenReturn(500l);
- when(cvo_cpu.getTotalCapacity()).thenReturn(2000l);
- when(cvo_ram.getUsedCapacity()).thenReturn(3000l);
- when(cvo_ram.getTotalCapacity()).thenReturn((long)1024 * 1024 * 1024);
+ when(CDao.findByHostIdType(anyLong(), eq(Capacity.CAPACITY_TYPE_CPU))).thenReturn(cvoCpu);
+ when(CDao.findByHostIdType(anyLong(), eq(Capacity.CAPACITY_TYPE_MEMORY))).thenReturn(cvoRam);
+ when(cvoCpu.getUsedCapacity()).thenReturn(500l);
+ when(cvoCpu.getTotalCapacity()).thenReturn(2000l);
+ when(cvoRam.getUsedCapacity()).thenReturn(3000l);
+ when(cvoRam.getTotalCapacity()).thenReturn((long)1024 * 1024 * 1024);
when(svo.getCpu()).thenReturn(500);
when(svo.getRamSize()).thenReturn(512);
- when(cvo_cpu.getReservedCapacity()).thenReturn(0l);
- when(cvo_ram.getReservedCapacity()).thenReturn(0l);
- when(cluster_detail_ram.getValue()).thenReturn("1.5");
- when(cluster_detail_cpu.getValue()).thenReturn("2");
+ when(cvoCpu.getReservedCapacity()).thenReturn(0l);
+ when(cvoRam.getReservedCapacity()).thenReturn(0l);
+ when(clusterDetailRam.getValue()).thenReturn("1.5");
+ when(clusterDetailCpu.getValue()).thenReturn("2");
when(CDao.update(anyLong(), isA(CapacityVO.class))).thenReturn(true);
boolean hasCapacity = capMgr.checkIfHostHasCapacity(1l, 500, 1024 * 1024 * 1024, false, 2, 2, false);
Assert.assertTrue(hasCapacity);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/test/com/cloud/network/DedicateGuestVlanRangesTest.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/network/DedicateGuestVlanRangesTest.java b/server/test/com/cloud/network/DedicateGuestVlanRangesTest.java
index 176891b..1615b84 100644
--- a/server/test/com/cloud/network/DedicateGuestVlanRangesTest.java
+++ b/server/test/com/cloud/network/DedicateGuestVlanRangesTest.java
@@ -93,7 +93,7 @@ public class DedicateGuestVlanRangesTest {
networkService._accountDao = _accountDao;
networkService._projectMgr = _projectMgr;
networkService._physicalNetworkDao = _physicalNetworkDao;
- networkService._datacneter_vnet = _dataCenterVnetDao;
+ networkService._datacneterVnet = _dataCenterVnetDao;
networkService._accountGuestVlanMapDao = _accountGuestVlanMapDao;
Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
@@ -194,18 +194,18 @@ public class DedicateGuestVlanRangesTest {
when(networkService._physicalNetworkDao.findById(anyLong())).thenReturn(physicalNetwork);
- when(networkService._datacneter_vnet.listAllocatedVnetsInRange(anyLong(), anyLong(), anyInt(), anyInt())).thenReturn(null);
+ when(networkService._datacneterVnet.listAllocatedVnetsInRange(anyLong(), anyLong(), anyInt(), anyInt())).thenReturn(null);
when(networkService._accountGuestVlanMapDao.listAccountGuestVlanMapsByPhysicalNetwork(anyLong())).thenReturn(null);
when(networkService._accountGuestVlanMapDao.persist(any(AccountGuestVlanMapVO.class))).thenReturn(accountGuestVlanMapVO);
- when(networkService._datacneter_vnet.update(anyLong(), any(DataCenterVnetVO.class))).thenReturn(true);
+ when(networkService._datacneterVnet.update(anyLong(), any(DataCenterVnetVO.class))).thenReturn(true);
List<DataCenterVnetVO> dataCenterVnetList = new ArrayList<DataCenterVnetVO>();
DataCenterVnetVO dataCenterVnetVO = new DataCenterVnetVO("2-5", 1L, 1L);
dataCenterVnetList.add(dataCenterVnetVO);
- when(networkService._datacneter_vnet.findVnet(anyLong(), anyString())).thenReturn(dataCenterVnetList);
+ when(networkService._datacneterVnet.findVnet(anyLong(), anyString())).thenReturn(dataCenterVnetList);
try {
GuestVlan result = networkService.dedicateGuestVlanRange(dedicateGuestVlanRangesCmd);
@@ -274,7 +274,7 @@ public class DedicateGuestVlanRangesTest {
DataCenterVnetVO dataCenter = new DataCenterVnetVO("2-5", 1L, 1L);
dataCenter.setAccountId(1L);
dataCenterList.add(dataCenter);
- when(networkService._datacneter_vnet.listAllocatedVnetsInRange(anyLong(), anyLong(), anyInt(), anyInt())).thenReturn(dataCenterList);
+ when(networkService._datacneterVnet.listAllocatedVnetsInRange(anyLong(), anyLong(), anyInt(), anyInt())).thenReturn(dataCenterList);
try {
networkService.dedicateGuestVlanRange(dedicateGuestVlanRangesCmd);
@@ -297,7 +297,7 @@ public class DedicateGuestVlanRangesTest {
when(networkService._physicalNetworkDao.findById(anyLong())).thenReturn(physicalNetwork);
- when(networkService._datacneter_vnet.listAllocatedVnetsInRange(anyLong(), anyLong(), anyInt(), anyInt())).thenReturn(null);
+ when(networkService._datacneterVnet.listAllocatedVnetsInRange(anyLong(), anyLong(), anyInt(), anyInt())).thenReturn(null);
List<AccountGuestVlanMapVO> guestVlanMaps = new ArrayList<AccountGuestVlanMapVO>();
AccountGuestVlanMapVO accountGuestVlanMap = new AccountGuestVlanMapVO(1L, 1L);
@@ -326,7 +326,7 @@ public class DedicateGuestVlanRangesTest {
when(networkService._physicalNetworkDao.findById(anyLong())).thenReturn(physicalNetwork);
- when(networkService._datacneter_vnet.listAllocatedVnetsInRange(anyLong(), anyLong(), anyInt(), anyInt())).thenReturn(null);
+ when(networkService._datacneterVnet.listAllocatedVnetsInRange(anyLong(), anyLong(), anyInt(), anyInt())).thenReturn(null);
List<AccountGuestVlanMapVO> guestVlanMaps = new ArrayList<AccountGuestVlanMapVO>();
AccountGuestVlanMapVO accountGuestVlanMap = new AccountGuestVlanMapVO(2L, 1L);
@@ -348,7 +348,7 @@ public class DedicateGuestVlanRangesTest {
AccountGuestVlanMapVO accountGuestVlanMap = new AccountGuestVlanMapVO(1L, 1L);
when(networkService._accountGuestVlanMapDao.findById(anyLong())).thenReturn(accountGuestVlanMap);
- doNothing().when(networkService._datacneter_vnet).releaseDedicatedGuestVlans(anyLong());
+ doNothing().when(networkService._datacneterVnet).releaseDedicatedGuestVlans(anyLong());
when(networkService._accountGuestVlanMapDao.remove(anyLong())).thenReturn(true);
try {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/test/com/cloud/network/MockFirewallManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/network/MockFirewallManagerImpl.java b/server/test/com/cloud/network/MockFirewallManagerImpl.java
index d3d11f1..3fbbcdf 100644
--- a/server/test/com/cloud/network/MockFirewallManagerImpl.java
+++ b/server/test/com/cloud/network/MockFirewallManagerImpl.java
@@ -167,7 +167,7 @@ public class MockFirewallManagerImpl extends ManagerBase implements FirewallMana
}
@Override
- public boolean applyIngressFirewallRules(long Ipid, Account caller) throws ResourceUnavailableException {
+ public boolean applyIngressFirewallRules(long ipId, Account caller) throws ResourceUnavailableException {
// TODO Auto-generated method stub
return false;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/test/com/cloud/network/UpdatePhysicalNetworkTest.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/network/UpdatePhysicalNetworkTest.java b/server/test/com/cloud/network/UpdatePhysicalNetworkTest.java
index 2608371..022181e 100644
--- a/server/test/com/cloud/network/UpdatePhysicalNetworkTest.java
+++ b/server/test/com/cloud/network/UpdatePhysicalNetworkTest.java
@@ -38,7 +38,7 @@ import com.cloud.utils.db.TransactionLegacy;
public class UpdatePhysicalNetworkTest {
private PhysicalNetworkDao _physicalNetworkDao = mock(PhysicalNetworkDao.class);
- private DataCenterVnetDao _DatacenterVnetDao = mock(DataCenterVnetDao.class);
+ private DataCenterVnetDao _datacenterVnetDao = mock(DataCenterVnetDao.class);
private DataCenterDao _datacenterDao = mock(DataCenterDao.class);
private DataCenterVO datacentervo = mock(DataCenterVO.class);
private PhysicalNetworkVO physicalNetworkVO = mock(PhysicalNetworkVO.class);
@@ -49,7 +49,7 @@ public class UpdatePhysicalNetworkTest {
NetworkServiceImpl networkService = new NetworkServiceImpl();
networkService._dcDao = _datacenterDao;
networkService._physicalNetworkDao = _physicalNetworkDao;
- networkService._datacneter_vnet = _DatacenterVnetDao;
+ networkService._datacneterVnet = _datacenterVnetDao;
return networkService;
}
@@ -61,7 +61,7 @@ public class UpdatePhysicalNetworkTest {
when(_physicalNetworkDao.findById(anyLong())).thenReturn(physicalNetworkVO);
when(_datacenterDao.findById(anyLong())).thenReturn(datacentervo);
when(_physicalNetworkDao.update(anyLong(), any(physicalNetworkVO.getClass()))).thenReturn(true);
- when(_DatacenterVnetDao.listVnetsByPhysicalNetworkAndDataCenter(anyLong(), anyLong())).thenReturn(existingRange);
+ when(_datacenterVnetDao.listVnetsByPhysicalNetworkAndDataCenter(anyLong(), anyLong())).thenReturn(existingRange);
networkService.updatePhysicalNetwork(1l, null, null, "524-524,525-530", null);
txn.close("updatePhysicalNetworkTest");
verify(physicalNetworkVO).setVnet(argumentCaptor.capture());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/test/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java b/server/test/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java
index 81aacdd..a5940cd 100644
--- a/server/test/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java
+++ b/server/test/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java
@@ -71,12 +71,12 @@ import com.cloud.vm.dao.VMInstanceDaoImpl;
@Configuration
@ComponentScan(basePackageClasses = {SecurityGroupRulesDaoImpl.class, UserVmDaoImpl.class, AccountDaoImpl.class, ConfigurationDaoImpl.class,
- SecurityGroupWorkDaoImpl.class, VmRulesetLogDaoImpl.class, VMInstanceDaoImpl.class, DomainDaoImpl.class, UsageEventDaoImpl.class,
- ResourceTagsDaoImpl.class, HostDaoImpl.class, HostDetailsDaoImpl.class, HostTagsDaoImpl.class, ClusterDaoImpl.class, HostPodDaoImpl.class,
- DataCenterDaoImpl.class, DataCenterIpAddressDaoImpl.class, HostTransferMapDaoImpl.class, SecurityGroupManagerImpl2.class, SecurityGroupDaoImpl.class,
- SecurityGroupVMMapDaoImpl.class, UserVmDetailsDaoImpl.class, DataCenterIpAddressDaoImpl.class, DataCenterLinkLocalIpAddressDaoImpl.class,
- DataCenterVnetDaoImpl.class, PodVlanDaoImpl.class, DataCenterDetailsDaoImpl.class, SecurityGroupRuleDaoImpl.class, NicDaoImpl.class,
- SecurityGroupJoinDaoImpl.class},
+ SecurityGroupWorkDaoImpl.class, VmRulesetLogDaoImpl.class, VMInstanceDaoImpl.class, DomainDaoImpl.class, UsageEventDaoImpl.class,
+ ResourceTagsDaoImpl.class, HostDaoImpl.class, HostDetailsDaoImpl.class, HostTagsDaoImpl.class, ClusterDaoImpl.class, HostPodDaoImpl.class,
+ DataCenterDaoImpl.class, DataCenterIpAddressDaoImpl.class, HostTransferMapDaoImpl.class, SecurityGroupManagerImpl2.class, SecurityGroupDaoImpl.class,
+ SecurityGroupVMMapDaoImpl.class, UserVmDetailsDaoImpl.class, DataCenterIpAddressDaoImpl.class, DataCenterLinkLocalIpAddressDaoImpl.class,
+ DataCenterVnetDaoImpl.class, PodVlanDaoImpl.class, DataCenterDetailsDaoImpl.class, SecurityGroupRuleDaoImpl.class, NicDaoImpl.class,
+ SecurityGroupJoinDaoImpl.class},
includeFilters = {@Filter(value = Library.class, type = FilterType.CUSTOM)},
useDefaultFilters = false)
public class SecurityGroupManagerTestConfiguration {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/test/com/cloud/snapshot/SnapshotDaoTestConfiguration.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/snapshot/SnapshotDaoTestConfiguration.java b/server/test/com/cloud/snapshot/SnapshotDaoTestConfiguration.java
index ffb97b8..1d6cf4c 100644
--- a/server/test/com/cloud/snapshot/SnapshotDaoTestConfiguration.java
+++ b/server/test/com/cloud/snapshot/SnapshotDaoTestConfiguration.java
@@ -43,7 +43,7 @@ import com.cloud.vm.dao.VMInstanceDaoImpl;
@Configuration
@ComponentScan(basePackageClasses = {SnapshotDaoImpl.class, ResourceTagsDaoImpl.class, VMInstanceDaoImpl.class, VolumeDaoImpl.class, NicDaoImpl.class, HostDaoImpl.class,
- HostDetailsDaoImpl.class, HostTagsDaoImpl.class, HostTransferMapDaoImpl.class, ClusterDaoImpl.class, HostPodDaoImpl.class},
+ HostDetailsDaoImpl.class, HostTagsDaoImpl.class, HostTransferMapDaoImpl.class, ClusterDaoImpl.class, HostPodDaoImpl.class},
includeFilters = {@Filter(value = SnapshotDaoTestConfiguration.Library.class, type = FilterType.CUSTOM)},
useDefaultFilters = false)
public class SnapshotDaoTestConfiguration {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/test/com/cloud/vm/snapshot/VMSnapshotManagerTest.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vm/snapshot/VMSnapshotManagerTest.java b/server/test/com/cloud/vm/snapshot/VMSnapshotManagerTest.java
index 352dbea..9d5c2b4 100644
--- a/server/test/com/cloud/vm/snapshot/VMSnapshotManagerTest.java
+++ b/server/test/com/cloud/vm/snapshot/VMSnapshotManagerTest.java
@@ -106,7 +106,7 @@ public class VMSnapshotManagerTest {
HypervisorCapabilitiesDao _hypervisorCapabilitiesDao;
int _vmSnapshotMax = 10;
- private static long TEST_VM_ID = 3L;
+ private static final long TEST_VM_ID = 3L;
@Mock
UserVmVO vmMock;
@Mock
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/test/com/cloud/vpc/MockResourceLimitManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/MockResourceLimitManagerImpl.java b/server/test/com/cloud/vpc/MockResourceLimitManagerImpl.java
index aec82fd..be49abd 100644
--- a/server/test/com/cloud/vpc/MockResourceLimitManagerImpl.java
+++ b/server/test/com/cloud/vpc/MockResourceLimitManagerImpl.java
@@ -22,7 +22,6 @@ import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
-import com.cloud.configuration.Resource;
import org.springframework.stereotype.Component;
import com.cloud.configuration.Resource.ResourceType;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java b/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
index dbb2cc9..4802cff 100644
--- a/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
+++ b/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
@@ -79,7 +79,7 @@ public class MockVpcVirtualNetworkApplianceManager extends ManagerBase implement
}
@Override
- public boolean saveSSHPublicKeyToRouter(Network network, NicProfile nic, VirtualMachineProfile profile, List<? extends VirtualRouter> routers, String SSHPublicKey)
+ public boolean saveSSHPublicKeyToRouter(Network network, NicProfile nic, VirtualMachineProfile profile, List<? extends VirtualRouter> routers, String sshPublicKey)
throws ResourceUnavailableException {
return false; //To change body of implemented methods use File | Settings | File Templates.
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/test/com/cloud/vpc/NetworkACLManagerTest.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/NetworkACLManagerTest.java b/server/test/com/cloud/vpc/NetworkACLManagerTest.java
index 54f5f78..2dd8b2d 100644
--- a/server/test/com/cloud/vpc/NetworkACLManagerTest.java
+++ b/server/test/com/cloud/vpc/NetworkACLManagerTest.java
@@ -51,6 +51,14 @@ import com.cloud.network.NetworkModel;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.NetworkVO;
import com.cloud.network.element.NetworkACLServiceProvider;
+import com.cloud.network.vpc.NetworkACLItem;
+import com.cloud.network.vpc.NetworkACLItemDao;
+import com.cloud.network.vpc.NetworkACLItemVO;
+import com.cloud.network.vpc.NetworkACLManager;
+import com.cloud.network.vpc.NetworkACLManagerImpl;
+import com.cloud.network.vpc.NetworkACLVO;
+import com.cloud.network.vpc.VpcManager;
+import com.cloud.network.vpc.VpcService;
import com.cloud.network.vpc.dao.NetworkACLDao;
import com.cloud.network.vpc.dao.VpcGatewayDao;
import com.cloud.tags.dao.ResourceTagDao;
@@ -309,7 +317,6 @@ public class NetworkACLManagerTest extends TestCase {
return Mockito.mock(VpcService.class);
}
-
public static class Library implements TypeFilter {
@Override
public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/test/com/cloud/vpc/NetworkACLServiceTest.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/NetworkACLServiceTest.java b/server/test/com/cloud/vpc/NetworkACLServiceTest.java
index 079cd5e..99fb771 100644
--- a/server/test/com/cloud/vpc/NetworkACLServiceTest.java
+++ b/server/test/com/cloud/vpc/NetworkACLServiceTest.java
@@ -20,8 +20,6 @@ import java.util.UUID;
import javax.inject.Inject;
-import com.cloud.network.vpc.*;
-import com.cloud.network.vpc.dao.VpcDao;
import junit.framework.TestCase;
import org.apache.log4j.Logger;
@@ -50,7 +48,19 @@ import org.apache.cloudstack.test.utils.SpringUtils;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.NetworkModel;
import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.vpc.NetworkACLItem;
+import com.cloud.network.vpc.NetworkACLItemDao;
+import com.cloud.network.vpc.NetworkACLItemVO;
+import com.cloud.network.vpc.NetworkACLManager;
+import com.cloud.network.vpc.NetworkACLService;
+import com.cloud.network.vpc.NetworkACLServiceImpl;
+import com.cloud.network.vpc.NetworkACLVO;
+import com.cloud.network.vpc.Vpc;
+import com.cloud.network.vpc.VpcManager;
+import com.cloud.network.vpc.VpcService;
+import com.cloud.network.vpc.VpcVO;
import com.cloud.network.vpc.dao.NetworkACLDao;
+import com.cloud.network.vpc.dao.VpcDao;
import com.cloud.network.vpc.dao.VpcGatewayDao;
import com.cloud.tags.dao.ResourceTagDao;
import com.cloud.user.Account;
@@ -83,7 +93,6 @@ public class NetworkACLServiceTest extends TestCase {
@Inject
VpcService _vpcSrv;
-
private CreateNetworkACLCmd createACLItemCmd;
private NetworkACLVO acl;
private NetworkACLItemVO aclItem;
@@ -244,7 +253,7 @@ public class NetworkACLServiceTest extends TestCase {
}
@Bean
- public VpcDao vpcDao () {
+ public VpcDao vpcDao() {
return Mockito.mock(VpcDao.class);
}
@@ -253,7 +262,6 @@ public class NetworkACLServiceTest extends TestCase {
return Mockito.mock(VpcService.class);
}
-
public static class Library implements TypeFilter {
@Override
public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/test/com/cloud/vpc/VpcTestConfiguration.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/VpcTestConfiguration.java b/server/test/com/cloud/vpc/VpcTestConfiguration.java
index 94e9212..8777698 100644
--- a/server/test/com/cloud/vpc/VpcTestConfiguration.java
+++ b/server/test/com/cloud/vpc/VpcTestConfiguration.java
@@ -108,20 +108,20 @@ import com.cloud.vpc.dao.MockVpcOfferingServiceMapDaoImpl;
@Configuration
@ComponentScan(basePackageClasses = {VpcManagerImpl.class, NetworkElement.class, VpcOfferingDao.class, ConfigurationDaoImpl.class, IPAddressDaoImpl.class,
- DomainRouterDaoImpl.class, VpcGatewayDaoImpl.class, PrivateIpDaoImpl.class, StaticRouteDaoImpl.class, PhysicalNetworkDaoImpl.class,
- ResourceTagsDaoImpl.class, FirewallRulesDaoImpl.class, VlanDaoImpl.class, AccountDaoImpl.class, ResourceCountDaoImpl.class,
- Site2SiteVpnGatewayDaoImpl.class, PodVlanMapDaoImpl.class, AccountVlanMapDaoImpl.class, HostDaoImpl.class, HostDetailsDaoImpl.class,
- HostTagsDaoImpl.class, HostTransferMapDaoImpl.class, ClusterDaoImpl.class, HostPodDaoImpl.class, RouterNetworkDaoImpl.class,
- UserStatisticsDaoImpl.class, PhysicalNetworkTrafficTypeDaoImpl.class, FirewallRulesCidrsDaoImpl.class, ResourceLimitManagerImpl.class,
- ResourceLimitDaoImpl.class, ResourceCountDaoImpl.class, DomainDaoImpl.class, UserVmDaoImpl.class, UserVmDetailsDaoImpl.class, NicDaoImpl.class,
- SnapshotDaoImpl.class, VMInstanceDaoImpl.class, VolumeDaoImpl.class, UserIpv6AddressDaoImpl.class, NicSecondaryIpDaoImpl.class,
- VpcServiceMapDaoImpl.class, ServiceOfferingDaoImpl.class, VMTemplateHostDaoImpl.class, MockVpcDaoImpl.class, VMTemplateDaoImpl.class,
- VMTemplateZoneDaoImpl.class, VMTemplateDetailsDaoImpl.class, DataCenterDaoImpl.class, DataCenterIpAddressDaoImpl.class,
- DataCenterLinkLocalIpAddressDaoImpl.class, DataCenterVnetDaoImpl.class, PodVlanDaoImpl.class, DataCenterDetailsDaoImpl.class,
- MockNetworkManagerImpl.class, MockVpcVirtualNetworkApplianceManager.class, EntityManagerImpl.class, LoadBalancerDaoImpl.class,
- FirewallRulesCidrsDaoImpl.class, VirtualRouterProviderDaoImpl.class, ProjectDaoImpl.class, ProjectAccountDaoImpl.class, MockVpcOfferingDaoImpl.class,
- MockConfigurationManagerImpl.class, MockNetworkOfferingServiceMapDaoImpl.class, MockNetworkServiceMapDaoImpl.class,
- MockVpcOfferingServiceMapDaoImpl.class, MockNetworkOfferingDaoImpl.class, MockNetworkModelImpl.class, Ipv6AddressManagerImpl.class},
+ DomainRouterDaoImpl.class, VpcGatewayDaoImpl.class, PrivateIpDaoImpl.class, StaticRouteDaoImpl.class, PhysicalNetworkDaoImpl.class,
+ ResourceTagsDaoImpl.class, FirewallRulesDaoImpl.class, VlanDaoImpl.class, AccountDaoImpl.class, ResourceCountDaoImpl.class,
+ Site2SiteVpnGatewayDaoImpl.class, PodVlanMapDaoImpl.class, AccountVlanMapDaoImpl.class, HostDaoImpl.class, HostDetailsDaoImpl.class,
+ HostTagsDaoImpl.class, HostTransferMapDaoImpl.class, ClusterDaoImpl.class, HostPodDaoImpl.class, RouterNetworkDaoImpl.class,
+ UserStatisticsDaoImpl.class, PhysicalNetworkTrafficTypeDaoImpl.class, FirewallRulesCidrsDaoImpl.class, ResourceLimitManagerImpl.class,
+ ResourceLimitDaoImpl.class, ResourceCountDaoImpl.class, DomainDaoImpl.class, UserVmDaoImpl.class, UserVmDetailsDaoImpl.class, NicDaoImpl.class,
+ SnapshotDaoImpl.class, VMInstanceDaoImpl.class, VolumeDaoImpl.class, UserIpv6AddressDaoImpl.class, NicSecondaryIpDaoImpl.class,
+ VpcServiceMapDaoImpl.class, ServiceOfferingDaoImpl.class, VMTemplateHostDaoImpl.class, MockVpcDaoImpl.class, VMTemplateDaoImpl.class,
+ VMTemplateZoneDaoImpl.class, VMTemplateDetailsDaoImpl.class, DataCenterDaoImpl.class, DataCenterIpAddressDaoImpl.class,
+ DataCenterLinkLocalIpAddressDaoImpl.class, DataCenterVnetDaoImpl.class, PodVlanDaoImpl.class, DataCenterDetailsDaoImpl.class,
+ MockNetworkManagerImpl.class, MockVpcVirtualNetworkApplianceManager.class, EntityManagerImpl.class, LoadBalancerDaoImpl.class,
+ FirewallRulesCidrsDaoImpl.class, VirtualRouterProviderDaoImpl.class, ProjectDaoImpl.class, ProjectAccountDaoImpl.class, MockVpcOfferingDaoImpl.class,
+ MockConfigurationManagerImpl.class, MockNetworkOfferingServiceMapDaoImpl.class, MockNetworkServiceMapDaoImpl.class,
+ MockVpcOfferingServiceMapDaoImpl.class, MockNetworkOfferingDaoImpl.class, MockNetworkModelImpl.class, Ipv6AddressManagerImpl.class},
includeFilters = {@Filter(value = VpcTestConfiguration.VpcLibrary.class, type = FilterType.CUSTOM)},
useDefaultFilters = false)
public class VpcTestConfiguration {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
----------------------------------------------------------------------
diff --git a/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java b/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
index 6d93f84..58d02fa 100644
--- a/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
+++ b/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
@@ -122,15 +122,15 @@ import com.cloud.vm.dao.VMInstanceDaoImpl;
@Configuration
@ComponentScan(basePackageClasses = {AccountVlanMapDaoImpl.class, VolumeDaoImpl.class, HostPodDaoImpl.class, DomainDaoImpl.class, ServiceOfferingDaoImpl.class,
- ServiceOfferingDetailsDaoImpl.class, VlanDaoImpl.class, IPAddressDaoImpl.class, ResourceTagsDaoImpl.class, AccountDaoImpl.class,
- InstanceGroupDaoImpl.class, UserAccountJoinDaoImpl.class, CapacityDaoImpl.class, SnapshotDaoImpl.class, HostDaoImpl.class, VMInstanceDaoImpl.class,
- HostTransferMapDaoImpl.class, PortForwardingRulesDaoImpl.class, PrivateIpDaoImpl.class, UsageEventDaoImpl.class, PodVlanMapDaoImpl.class,
- DiskOfferingDaoImpl.class, DataCenterDaoImpl.class, DataCenterIpAddressDaoImpl.class, DataCenterVnetDaoImpl.class, PodVlanDaoImpl.class,
- DataCenterDetailsDaoImpl.class, NicSecondaryIpDaoImpl.class, UserIpv6AddressDaoImpl.class, UserDaoImpl.class, NicDaoImpl.class,
- NetworkDomainDaoImpl.class, HostDetailsDaoImpl.class, HostTagsDaoImpl.class, ClusterDaoImpl.class, FirewallRulesDaoImpl.class,
- FirewallRulesCidrsDaoImpl.class, PhysicalNetworkDaoImpl.class, PhysicalNetworkTrafficTypeDaoImpl.class, PhysicalNetworkServiceProviderDaoImpl.class,
- LoadBalancerDaoImpl.class, NetworkServiceMapDaoImpl.class, PrimaryDataStoreDaoImpl.class, StoragePoolDetailsDaoImpl.class,
- PortableIpRangeDaoImpl.class, RegionDaoImpl.class, PortableIpDaoImpl.class, AccountGuestVlanMapDaoImpl.class},
+ ServiceOfferingDetailsDaoImpl.class, VlanDaoImpl.class, IPAddressDaoImpl.class, ResourceTagsDaoImpl.class, AccountDaoImpl.class,
+ InstanceGroupDaoImpl.class, UserAccountJoinDaoImpl.class, CapacityDaoImpl.class, SnapshotDaoImpl.class, HostDaoImpl.class, VMInstanceDaoImpl.class,
+ HostTransferMapDaoImpl.class, PortForwardingRulesDaoImpl.class, PrivateIpDaoImpl.class, UsageEventDaoImpl.class, PodVlanMapDaoImpl.class,
+ DiskOfferingDaoImpl.class, DataCenterDaoImpl.class, DataCenterIpAddressDaoImpl.class, DataCenterVnetDaoImpl.class, PodVlanDaoImpl.class,
+ DataCenterDetailsDaoImpl.class, NicSecondaryIpDaoImpl.class, UserIpv6AddressDaoImpl.class, UserDaoImpl.class, NicDaoImpl.class,
+ NetworkDomainDaoImpl.class, HostDetailsDaoImpl.class, HostTagsDaoImpl.class, ClusterDaoImpl.class, FirewallRulesDaoImpl.class,
+ FirewallRulesCidrsDaoImpl.class, PhysicalNetworkDaoImpl.class, PhysicalNetworkTrafficTypeDaoImpl.class, PhysicalNetworkServiceProviderDaoImpl.class,
+ LoadBalancerDaoImpl.class, NetworkServiceMapDaoImpl.class, PrimaryDataStoreDaoImpl.class, StoragePoolDetailsDaoImpl.class,
+ PortableIpRangeDaoImpl.class, RegionDaoImpl.class, PortableIpDaoImpl.class, AccountGuestVlanMapDaoImpl.class},
includeFilters = {@Filter(value = ChildTestConfiguration.Library.class, type = FilterType.CUSTOM)},
useDefaultFilters = false)
public class ChildTestConfiguration {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/AwtRdpMouseAdapter.java
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/AwtRdpMouseAdapter.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/AwtRdpMouseAdapter.java
index bb7c586..f533906 100644
--- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/AwtRdpMouseAdapter.java
+++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/AwtRdpMouseAdapter.java
@@ -17,7 +17,6 @@
package rdpclient;
import java.awt.event.InputEvent;
-import java.awt.event.MouseEvent;
import streamer.BaseElement;
import streamer.ByteBuffer;
@@ -28,58 +27,58 @@ import common.MouseOrder;
* @see http://msdn.microsoft.com/en-us/library/cc240594.aspx
*/
public class AwtRdpMouseAdapter extends BaseElement {
- public static int FASTPATH_INPUT_EVENT_MOUSE = 0x01;
+ public static final int FASTPATH_INPUT_EVENT_MOUSE = 0x01;
/**
* Event is a mouse wheel rotation. The only valid flags in a wheel rotation
* event are PTRFLAGS_WHEEL_NEGATIVE and the WheelRotationMask; all other
* pointer flags are ignored.
*/
- public static int PTRFLAGS_WHEEL = 0x0200;
+ public static final int PTRFLAGS_WHEEL = 0x0200;
/**
* Wheel rotation value (contained in the WheelRotationMask bit field) is
* negative and MUST be sign-extended before injection at the server.
*/
- public static int PTRFLAGS_WHEEL_NEGATIVE = 0x0100;
+ public static final int PTRFLAGS_WHEEL_NEGATIVE = 0x0100;
/**
* Bit field describing the number of rotation units the mouse wheel was
* rotated. The value is negative if the PTRFLAGS_WHEEL_NEGATIVE flag is set.
*/
- public static int WHEEL_ROTATION_MASK = 0x01FF;
+ public static final int WHEEL_ROTATION_MASK = 0x01FF;
/**
* Indicates that the mouse position MUST be updated to the location specified
* by the xPos and yPos fields.
*/
- public static int PTRFLAGS_MOVE = 0x0800;
+ public static final int PTRFLAGS_MOVE = 0x0800;
/**
* Indicates that a click event has occurred at the position specified by the
* xPos and yPos fields. The button flags indicate which button has been
* clicked and at least one of these flags MUST be set.
*/
- public static int PTRFLAGS_DOWN = 0x8000;
+ public static final int PTRFLAGS_DOWN = 0x8000;
/**
* Mouse button 1 (left button) was clicked or released. If the PTRFLAGS_DOWN
* flag is set, then the button was clicked, otherwise it was released.
*/
- public static int PTRFLAGS_BUTTON1 = 0x1000;
+ public static final int PTRFLAGS_BUTTON1 = 0x1000;
/**
* Mouse button 2 (right button) was clicked or released. If the PTRFLAGS_DOWN
* flag is set, then the button was clicked, otherwise it was released.
*/
- public static int PTRFLAGS_BUTTON2 = 0x2000;
+ public static final int PTRFLAGS_BUTTON2 = 0x2000;
/**
* Mouse button 3 (middle button or wheel) was clicked or released. If the
* PTRFLAGS_DOWN flag is set, then the button was clicked, otherwise it was
* released.
*/
- public static int PTRFLAGS_BUTTON3 = 0x4000;
+ public static final int PTRFLAGS_BUTTON3 = 0x4000;
public AwtRdpMouseAdapter(String id) {
super(id);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs.java
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs.java
new file mode 100644
index 0000000..6e06af4
--- /dev/null
+++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs.java
@@ -0,0 +1,222 @@
+// 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 rdpclient;
+
+import streamer.ByteBuffer;
+import streamer.Element;
+import streamer.Link;
+import streamer.MockSink;
+import streamer.MockSource;
+import streamer.OneTimeSwitch;
+import streamer.Pipeline;
+import streamer.PipelineImpl;
+
+/**
+ * The MCS Channel Join Request PDUs are sent sequentially. The first PDU is
+ * sent after receiving the MCS Attach User Confirm PDU and subsequent PDUs are
+ * sent after receiving the MCS Channel Join Confirm PDU for the previous
+ * request. Sending of the MCS Channel Join Request PDUs MUST continue until all
+ * channels have been successfully joined.
+ *
+ * @see http://msdn.microsoft.com/en-us/library/cc240686.aspx
+ */
+public class ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs extends OneTimeSwitch {
+
+ private static final int MCS_CHANNEL_CONFIRM_PDU = 15;
+
+ protected int[] channels;
+ protected int channelRequestsSent = 0;
+
+ protected RdpState state;
+
+ public ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs(String id, int[] channels, RdpState state) {
+ super(id);
+ this.channels = channels;
+ this.state = state;
+ }
+
+ @Override
+ protected void handleOneTimeData(ByteBuffer buf, Link link) {
+ if (buf == null)
+ return;
+
+ // Parse channel confirm response
+ int typeAndFlags = buf.readUnsignedByte();
+ int type = typeAndFlags >> 2;
+ // int flags = typeAndFlags & 0x3;
+
+ if (type != MCS_CHANNEL_CONFIRM_PDU)
+ throw new RuntimeException("[" + this + "] ERROR: Incorrect type of MCS AttachUserConfirm PDU. Expected value: 15, actual value: " + type + ", data: " + buf +
+ ".");
+
+ int rtSuccess = buf.readUnsignedByte() >> 4;
+ if (rtSuccess != 0)
+ throw new RuntimeException("[" + this + "] ERROR: Cannot connect to channel: request failed. Error code: " + rtSuccess + ", channel ID: " +
+ channels[channelRequestsSent - 1] + ", data: " + buf + ".");
+
+ // Initiator and requested fields MAY be ignored, however, the channelId
+ // field MUST be examined. If the value of the channelId field does not
+ // correspond with the value of the channelId field sent in the previous MCS
+ // Channel Join Request PDU the connection SHOULD be dropped.
+
+ // Initiator: 1007 (6+1001)
+ // int initator=buf.readUnsignedShort();
+ buf.skipBytes(2);
+
+ // Requested channel
+ // int requestedChannel=buf.readUnsignedShort();
+ buf.skipBytes(2);
+
+ // Actual channel
+ int actualChannel = buf.readUnsignedShort();
+ if (actualChannel != channels[channelRequestsSent - 1])
+ throw new RuntimeException("Unexpeceted channeld ID returned. Expected channeld ID: " + channels[channelRequestsSent - 1] + ", actual channel ID: " +
+ actualChannel + ", data: " + buf + ".");
+
+ state.channelJoined(actualChannel);
+
+ buf.unref();
+
+ if (channelRequestsSent < channels.length)
+ sendChannelRequest(channels[channelRequestsSent++]);
+ else
+ switchOff();
+ }
+
+ @Override
+ protected void onStart() {
+ super.onStart();
+
+ sendChannelRequest(channels[channelRequestsSent++]);
+
+ // Switch off after receiving response(s)
+ }
+
+ private void sendChannelRequest(int channel) {
+ ByteBuffer buf = new ByteBuffer(5, true);
+
+ buf.writeByte(0x38); // Channel Join request
+
+ buf.writeShort(0x03); // ChannelJoinRequest::initiator: 1004
+ buf.writeShort(channel);
+
+ pushDataToOTOut(buf);
+ }
+
+ /**
+ * Example.
+ *
+ * @see http://msdn.microsoft.com/en-us/library/cc240834.aspx
+ */
+ public static void main(String args[]) {
+ // System.setProperty("streamer.Link.debug", "true");
+ System.setProperty("streamer.Element.debug", "true");
+ // System.setProperty("streamer.Pipeline.debug", "true");
+
+ /* @formatter:off */
+ byte[] clientRequestPacket = new byte[] {
+ 0x03, 0x00, 0x00, 0x0c, // TPKT Header (length = 12 bytes)
+ 0x02, (byte) 0xf0, (byte) 0x80, // X.224 Data TPDU
+
+ // PER encoded (ALIGNED variant of BASIC-PER) PDU contents:
+ 0x38, 0x00, 0x03, 0x03, (byte) 0xef,
+
+ // 0x38:
+ // 0 - --\
+ // 0 - |
+ // 1 - | CHOICE: From DomainMCSPDU select channelJoinRequest (14)
+ // 1 - | of type ChannelJoinRequest
+ // 1 - |
+ // 0 - --/
+ // 0 - padding
+ // 0 - padding
+
+ // 0x00:
+ // 0 - --\
+ // 0 - |
+ // 0 - |
+ // 0 - |
+ // 0 - |
+ // 0 - |
+ // 0 - |
+ // 0 - |
+ // | ChannelJoinRequest::initiator = 0x03 + 1001 = 1004
+ // 0x03: |
+ // 0 - |
+ // 0 - |
+ // 0 - |
+ // 0 - |
+ // 0 - |
+ // 1 - |
+ // 1 - |
+ // 0 - --/
+
+ // 0x03:
+ // 0 - --\
+ // 0 - |
+ // 0 - |
+ // 0 - |
+ // 0 - |
+ // 0 - |
+ // 1 - |
+ // 1 - |
+ // | ChannelJoinRequest::channelId = 0x03ef = 1007
+ // 0xef: |
+ // 1 - |
+ // 1 - |
+ // 1 - |
+ // 0 - |
+ // 1 - |
+ // 1 - |
+ // 1 - |
+ // 1 - --/
+ };
+
+ byte[] serverResponsePacket = new byte[] {
+ // MCS Channel Confirm
+ (byte)0x3e,
+
+ // result: rt-successful (0)
+ (byte)0x00,
+
+ // Initiator: 1007 (6+1001)
+ (byte)0x00, (byte)0x06,
+
+ // Requested channel
+ (byte)0x03, (byte)0xef,
+
+ // Actual channel
+ (byte)0x03, (byte)0xef,
+ };
+ /* @formatter:on */
+
+ RdpState rdpState = new RdpState();
+ MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(serverResponsePacket, new byte[] {1, 2, 3}));
+ Element todo = new ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs("channels", new int[] {1007}, rdpState);
+ Element x224 = new ClientX224DataPdu("x224");
+ Element tpkt = new ClientTpkt("tpkt");
+ Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(clientRequestPacket));
+ Element mainSink = new MockSink("mainSink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {1, 2, 3}));
+
+ Pipeline pipeline = new PipelineImpl("test");
+ pipeline.add(source, todo, x224, tpkt, sink, mainSink);
+ pipeline.link("source", "channels", "mainSink");
+ pipeline.link("channels >" + OTOUT, "x224", "tpkt", "sink");
+ pipeline.runMainLoop("source", STDOUT, false, false);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs.java
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs.java
deleted file mode 100644
index 0b902a3..0000000
--- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs.java
+++ /dev/null
@@ -1,222 +0,0 @@
-// 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 rdpclient;
-
-import streamer.ByteBuffer;
-import streamer.Element;
-import streamer.Link;
-import streamer.MockSink;
-import streamer.MockSource;
-import streamer.OneTimeSwitch;
-import streamer.Pipeline;
-import streamer.PipelineImpl;
-
-/**
- * The MCS Channel Join Request PDUs are sent sequentially. The first PDU is
- * sent after receiving the MCS Attach User Confirm PDU and subsequent PDUs are
- * sent after receiving the MCS Channel Join Confirm PDU for the previous
- * request. Sending of the MCS Channel Join Request PDUs MUST continue until all
- * channels have been successfully joined.
- *
- * @see http://msdn.microsoft.com/en-us/library/cc240686.aspx
- */
-public class ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs extends OneTimeSwitch {
-
- private static final int MCS_CHANNEL_CONFIRM_PDU = 15;
-
- protected int[] channels;
- protected int channelRequestsSent = 0;
-
- protected RdpState state;
-
- public ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs(String id, int[] channels, RdpState state) {
- super(id);
- this.channels = channels;
- this.state = state;
- }
-
- @Override
- protected void handleOneTimeData(ByteBuffer buf, Link link) {
- if (buf == null)
- return;
-
- // Parse channel confirm response
- int typeAndFlags = buf.readUnsignedByte();
- int type = typeAndFlags >> 2;
- // int flags = typeAndFlags & 0x3;
-
- if (type != MCS_CHANNEL_CONFIRM_PDU)
- throw new RuntimeException("[" + this + "] ERROR: Incorrect type of MCS AttachUserConfirm PDU. Expected value: 15, actual value: " + type + ", data: " + buf +
- ".");
-
- int rtSuccess = buf.readUnsignedByte() >> 4;
- if (rtSuccess != 0)
- throw new RuntimeException("[" + this + "] ERROR: Cannot connect to channel: request failed. Error code: " + rtSuccess + ", channel ID: " +
- channels[channelRequestsSent - 1] + ", data: " + buf + ".");
-
- // Initiator and requested fields MAY be ignored, however, the channelId
- // field MUST be examined. If the value of the channelId field does not
- // correspond with the value of the channelId field sent in the previous MCS
- // Channel Join Request PDU the connection SHOULD be dropped.
-
- // Initiator: 1007 (6+1001)
- // int initator=buf.readUnsignedShort();
- buf.skipBytes(2);
-
- // Requested channel
- // int requestedChannel=buf.readUnsignedShort();
- buf.skipBytes(2);
-
- // Actual channel
- int actualChannel = buf.readUnsignedShort();
- if (actualChannel != channels[channelRequestsSent - 1])
- throw new RuntimeException("Unexpeceted channeld ID returned. Expected channeld ID: " + channels[channelRequestsSent - 1] + ", actual channel ID: " +
- actualChannel + ", data: " + buf + ".");
-
- state.channelJoined(actualChannel);
-
- buf.unref();
-
- if (channelRequestsSent < channels.length)
- sendChannelRequest(channels[channelRequestsSent++]);
- else
- switchOff();
- }
-
- @Override
- protected void onStart() {
- super.onStart();
-
- sendChannelRequest(channels[channelRequestsSent++]);
-
- // Switch off after receiving response(s)
- }
-
- private void sendChannelRequest(int channel) {
- ByteBuffer buf = new ByteBuffer(5, true);
-
- buf.writeByte(0x38); // Channel Join request
-
- buf.writeShort(0x03); // ChannelJoinRequest::initiator: 1004
- buf.writeShort(channel);
-
- pushDataToOTOut(buf);
- }
-
- /**
- * Example.
- *
- * @see http://msdn.microsoft.com/en-us/library/cc240834.aspx
- */
- public static void main(String args[]) {
- // System.setProperty("streamer.Link.debug", "true");
- System.setProperty("streamer.Element.debug", "true");
- // System.setProperty("streamer.Pipeline.debug", "true");
-
- /* @formatter:off */
- byte[] clientRequestPacket = new byte[] {
- 0x03, 0x00, 0x00, 0x0c, // TPKT Header (length = 12 bytes)
- 0x02, (byte) 0xf0, (byte) 0x80, // X.224 Data TPDU
-
- // PER encoded (ALIGNED variant of BASIC-PER) PDU contents:
- 0x38, 0x00, 0x03, 0x03, (byte) 0xef,
-
- // 0x38:
- // 0 - --\
- // 0 - |
- // 1 - | CHOICE: From DomainMCSPDU select channelJoinRequest (14)
- // 1 - | of type ChannelJoinRequest
- // 1 - |
- // 0 - --/
- // 0 - padding
- // 0 - padding
-
- // 0x00:
- // 0 - --\
- // 0 - |
- // 0 - |
- // 0 - |
- // 0 - |
- // 0 - |
- // 0 - |
- // 0 - |
- // | ChannelJoinRequest::initiator = 0x03 + 1001 = 1004
- // 0x03: |
- // 0 - |
- // 0 - |
- // 0 - |
- // 0 - |
- // 0 - |
- // 1 - |
- // 1 - |
- // 0 - --/
-
- // 0x03:
- // 0 - --\
- // 0 - |
- // 0 - |
- // 0 - |
- // 0 - |
- // 0 - |
- // 1 - |
- // 1 - |
- // | ChannelJoinRequest::channelId = 0x03ef = 1007
- // 0xef: |
- // 1 - |
- // 1 - |
- // 1 - |
- // 0 - |
- // 1 - |
- // 1 - |
- // 1 - |
- // 1 - --/
- };
-
- byte[] serverResponsePacket = new byte[] {
- // MCS Channel Confirm
- (byte)0x3e,
-
- // result: rt-successful (0)
- (byte)0x00,
-
- // Initiator: 1007 (6+1001)
- (byte)0x00, (byte)0x06,
-
- // Requested channel
- (byte)0x03, (byte)0xef,
-
- // Actual channel
- (byte)0x03, (byte)0xef,
- };
- /* @formatter:on */
-
- RdpState rdpState = new RdpState();
- MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(serverResponsePacket, new byte[] {1, 2, 3}));
- Element todo = new ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs("channels", new int[] {1007}, rdpState);
- Element x224 = new ClientX224DataPdu("x224");
- Element tpkt = new ClientTpkt("tpkt");
- Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(clientRequestPacket));
- Element mainSink = new MockSink("mainSink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {1, 2, 3}));
-
- Pipeline pipeline = new PipelineImpl("test");
- pipeline.add(source, todo, x224, tpkt, sink, mainSink);
- pipeline.link("source", "channels", "mainSink");
- pipeline.link("channels >" + OTOUT, "x224", "tpkt", "sink");
- pipeline.runMainLoop("source", STDOUT, false, false);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientPacketSniffer.java
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientPacketSniffer.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientPacketSniffer.java
index ce517d2..78f5235 100644
--- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientPacketSniffer.java
+++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientPacketSniffer.java
@@ -40,7 +40,7 @@ public class ClientPacketSniffer extends PacketSniffer {
// new Pair("Client UNKNOWN PACKET (ERROR)", ".*"),
// @formatter:on
- };
+ };
public ClientPacketSniffer(String id) {
super(id, clientRegexps);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientX224ConnectionRequestPDU.java
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientX224ConnectionRequestPDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientX224ConnectionRequestPDU.java
index fbbfecb..66d0fd5 100644
--- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientX224ConnectionRequestPDU.java
+++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientX224ConnectionRequestPDU.java
@@ -119,7 +119,7 @@ public class ClientX224ConnectionRequestPDU extends OneTimeSwitch {
byte[] packet = new byte[] {
- 0x03, // TPKT Header: version = 3
+ 0x03, // TPKT Header: version = 3
0x00, // TPKT Header: Reserved = 0
0x00, // TPKT Header: Packet length - high part
0x2c, // TPKT Header: Packet length - low part (total = 44 bytes)
@@ -138,7 +138,7 @@ public class ClientX224ConnectionRequestPDU extends OneTimeSwitch {
0x08, 0x00, // RDP_NEG_REQ::length (8 bytes)
0x01, 0x00, 0x00, 0x00 // RDP_NEG_REQ: Requested protocols
// (PROTOCOL_SSL in little endian format)
- };
+ };
MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {1, 2, 3}));
Element cr = new ClientX224ConnectionRequestPDU("cr", cookie);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpClient.java
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpClient.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpClient.java
index 825964f..ef05eda 100644
--- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpClient.java
+++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpClient.java
@@ -57,30 +57,30 @@ public class RdpClient extends PipelineImpl {
add(
- new ClientX224ConnectionRequestPDU("client_connection_req", userName), new ServerX224ConnectionConfirmPDU("server_connection_conf"),
+ new ClientX224ConnectionRequestPDU("client_connection_req", userName), new ServerX224ConnectionConfirmPDU("server_connection_conf"),
- new UpgradeSocketToSSL("upgrade_to_ssl"),
+ new UpgradeSocketToSSL("upgrade_to_ssl"),
- new ClientMCSConnectInitial("client_initial_conference_create"), new ServerMCSConnectResponse("server_initial_conference_create"),
+ new ClientMCSConnectInitial("client_initial_conference_create"), new ServerMCSConnectResponse("server_initial_conference_create"),
- new ClientMCSErectDomainRequest("client_erect_domain"),
+ new ClientMCSErectDomainRequest("client_erect_domain"),
- new ClientMCSAttachUserRequest("client_atach_user"), new ServerMCSAttachUserConfirmPDU("server_atach_user_confirm", state),
+ new ClientMCSAttachUserRequest("client_atach_user"), new ServerMCSAttachUserConfirmPDU("server_atach_user_confirm", state),
- new ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs("client_channel_join_rdprdr", channelsToJoin, state),
+ new ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs("client_channel_join_rdprdr", channelsToJoin, state),
- new ClientInfoPDU("client_info_req", userName),
+ new ClientInfoPDU("client_info_req", userName),
- new ServerLicenseErrorPDUValidClient("server_valid_client"),
+ new ServerLicenseErrorPDUValidClient("server_valid_client"),
- new ServerFastPath("server_fastpath"),
+ new ServerFastPath("server_fastpath"),
- new ServerTpkt("server_tpkt"),
+ new ServerTpkt("server_tpkt"),
- new ServerX224DataPdu("server_x224_data"),
+ new ServerX224DataPdu("server_x224_data"),
- // These TPKT and X224 wrappers are connected directly to OUT for handshake
- // sequence
+ // These TPKT and X224 wrappers are connected directly to OUT for handshake
+ // sequence
new ClientTpkt("client_tpkt_ot"),
new ClientX224DataPdu("client_x224_data_ot")
@@ -90,25 +90,25 @@ public class RdpClient extends PipelineImpl {
// Handshake sequence (via SlowPath)
link("IN",
- "server_fastpath >tpkt", "server_tpkt",
+ "server_fastpath >tpkt", "server_tpkt",
- "client_connection_req", "server_connection_conf",
+ "client_connection_req", "server_connection_conf",
- "upgrade_to_ssl",
+ "upgrade_to_ssl",
- "client_initial_conference_create", "server_initial_conference_create",
+ "client_initial_conference_create", "server_initial_conference_create",
- "client_erect_domain",
+ "client_erect_domain",
- "server_x224_data",
+ "server_x224_data",
- "client_atach_user", "server_atach_user_confirm",
+ "client_atach_user", "server_atach_user_confirm",
- "client_channel_join_rdprdr",
+ "client_channel_join_rdprdr",
- "client_info_req",
+ "client_info_req",
- "server_valid_client"
+ "server_valid_client"
);
@@ -134,10 +134,10 @@ public class RdpClient extends PipelineImpl {
//
add(
- // To transfer packets between input threads and output thread.
- new Queue("queue"),
+ // To transfer packets between input threads and output thread.
+ new Queue("queue"),
- // Slow path: MultiChannel Support
+ // Slow path: MultiChannel Support
new ServerMCSPDU("server_mcs")
);
@@ -165,23 +165,23 @@ public class RdpClient extends PipelineImpl {
// Add elements
add(
- new ServerChannel1003Router("server_channel_1003", state),
+ new ServerChannel1003Router("server_channel_1003", state),
- new ServerDemandActivePDU("server_demand_active", screen, state),
+ new ServerDemandActivePDU("server_demand_active", screen, state),
- new ClientConfirmActivePDU("client_confirm_active", screen, state),
+ new ClientConfirmActivePDU("client_confirm_active", screen, state),
- new ServerBitmapUpdate("server_bitmap_update"),
+ new ServerBitmapUpdate("server_bitmap_update"),
- new AwtCanvasAdapter("canvas_adapter", canvas, screen),
+ new AwtCanvasAdapter("canvas_adapter", canvas, screen),
- new ServerPaletteUpdate("server_palette", screen),
+ new ServerPaletteUpdate("server_palette", screen),
- keyEventSource, new AwtRdpKeyboardAdapter("keyboard_adapter"),
+ keyEventSource, new AwtRdpKeyboardAdapter("keyboard_adapter"),
- mouseEventSource, new AwtRdpMouseAdapter("mouse_adapter"),
+ mouseEventSource, new AwtRdpMouseAdapter("mouse_adapter"),
- // These FastPath, TPKT, and X224 wrappers are connected to queue
+ // These FastPath, TPKT, and X224 wrappers are connected to queue
new ClientTpkt("client_tpkt_queue"),
new ClientX224DataPdu("client_x224_data_queue"),
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerPacketSniffer.java
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerPacketSniffer.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerPacketSniffer.java
index 290c1bc..8d50ea4 100644
--- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerPacketSniffer.java
+++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerPacketSniffer.java
@@ -41,7 +41,7 @@ public class ServerPacketSniffer extends PacketSniffer {
// new Pair("Server FastPath update with flags or continuation", ".*"),
// @formatter:on
- };
+ };
public ServerPacketSniffer(String id) {
super(id, serverRegexps);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerX224ConnectionConfirmPDU.java
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerX224ConnectionConfirmPDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerX224ConnectionConfirmPDU.java
index c320573..7dd70eb 100644
--- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerX224ConnectionConfirmPDU.java
+++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerX224ConnectionConfirmPDU.java
@@ -206,7 +206,7 @@ public class ServerX224ConnectionConfirmPDU extends OneTimeSwitch {
// 03 00 00 13 0e d0 00 00 12 34 00 03 00 08 00 05 00 00 00
byte[] packet = new byte[] {
- 0x03, // -> TPKT Header: TPKT version = 3
+ 0x03, // -> TPKT Header: TPKT version = 3
0x00, // TPKT Header: Reserved = 0
0x00, 0x13, // TPKT Header: Packet length - (total = 19 bytes)
0x0e, // X.224: Length indicator (14 bytes)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java
index 19ac062..dfffd35 100644
--- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java
+++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java
@@ -46,7 +46,7 @@ public class SocketWrapper extends PipelineImpl {
protected SSLSocket sslSocket;
//protected String SSL_VERSION_TO_USE = "TLSv1.2";
- /*DEBUG*/protected String SSL_VERSION_TO_USE = "TLSv1";
+ /*DEBUG*/protected static final String SSL_VERSION_TO_USE = "TLSv1";
public SocketWrapper(String id) {
super(id);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/AwtMouseEventToVncAdapter.java
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/AwtMouseEventToVncAdapter.java b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/AwtMouseEventToVncAdapter.java
index a54d101..8af0195 100644
--- a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/AwtMouseEventToVncAdapter.java
+++ b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/AwtMouseEventToVncAdapter.java
@@ -17,7 +17,6 @@
package vncclient;
import java.awt.event.InputEvent;
-import java.awt.event.MouseEvent;
import streamer.BaseElement;
import streamer.ByteBuffer;