diff --git a/agent/src/main/java/com/cloud/agent/Agent.java b/agent/src/main/java/com/cloud/agent/Agent.java index b7c24e5126cb..9ba97949c262 100644 --- a/agent/src/main/java/com/cloud/agent/Agent.java +++ b/agent/src/main/java/com/cloud/agent/Agent.java @@ -1321,7 +1321,6 @@ public void doTask(final Task task) throws TaskExecutionException { processResponse((Response)request, task.getLink()); } else { //put the requests from mgt server into another thread pool, as the request may take a longer time to finish. Don't block the NIO main thread pool - //processRequest(request, task.getLink()); requestHandler.submit(new AgentRequestHandler(getType(), getLink(), request)); } } catch (final ClassNotFoundException e) { diff --git a/api/src/main/java/com/cloud/host/HostStats.java b/api/src/main/java/com/cloud/host/HostStats.java index d14794401fa3..0e72b5f2d9d0 100644 --- a/api/src/main/java/com/cloud/host/HostStats.java +++ b/api/src/main/java/com/cloud/host/HostStats.java @@ -36,5 +36,4 @@ public interface HostStats { public HostStats getHostStats(); public double getLoadAverage(); - // public double getXapiMemoryUsageKBs(); } diff --git a/api/src/main/java/com/cloud/network/rules/LbStickinessMethod.java b/api/src/main/java/com/cloud/network/rules/LbStickinessMethod.java index 56a0622a52ba..5143611ee828 100644 --- a/api/src/main/java/com/cloud/network/rules/LbStickinessMethod.java +++ b/api/src/main/java/com/cloud/network/rules/LbStickinessMethod.java @@ -108,8 +108,7 @@ public LbStickinessMethod(StickinessMethodType methodType, String description) { } public void addParam(String name, Boolean required, String description, Boolean isFlag) { - /* FIXME : UI is breaking if the capability string length is larger , temporarily description is commented out */ - // LbStickinessMethodParam param = new LbStickinessMethodParam(name, required, description); + /* is this still a valid comment: FIXME : UI is breaking if the capability string length is larger , temporarily description is commented out */ LbStickinessMethodParam param = new LbStickinessMethodParam(name, required, " ", isFlag); _paramList.add(param); return; @@ -133,7 +132,6 @@ public String getDescription() { public void setDescription(String description) { /* FIXME : UI is breaking if the capability string length is larger , temporarily description is commented out */ - //this.description = description; this._description = " "; } } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java index 46bd4f3766e7..57cb461a07a5 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java @@ -1,4 +1,4 @@ -// Licensedname = "listIsoPermissions", to the Apache Software Foundation (ASF) under one +// 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 diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java index ae0e220b4952..5792de737a53 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java @@ -1,4 +1,4 @@ -// Licensedname = "listTemplatePermissions", to the Apache Software Foundation (ASF) under one +// 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 diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java index 6f220c774b84..95c7f5fe309d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java @@ -1,4 +1,4 @@ -// Licensedname = "listIsoPermissions", to the Apache Software Foundation (ASF) under one +// 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 diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java index 6d544df41871..408f916abdaa 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java @@ -1,4 +1,4 @@ -// Licensedname = "listTemplatePermissions", to the Apache Software Foundation (ASF) under one +// 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 diff --git a/api/src/main/java/org/apache/cloudstack/api/response/SslCertResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SslCertResponse.java index aa729f123b44..f7022cecb709 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/SslCertResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/SslCertResponse.java @@ -27,8 +27,6 @@ import org.apache.cloudstack.network.tls.SslCert; import com.cloud.serializer.Param; -//import org.apache.cloudstack.api.EntityReference; - @EntityReference(value = SslCert.class) public class SslCertResponse extends BaseResponse { diff --git a/api/src/test/java/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java index 3ed1d9389d42..b76041755f57 100644 --- a/api/src/test/java/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java +++ b/api/src/test/java/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java @@ -78,10 +78,6 @@ public void testCreateSuccess() { scaleVMCmd._responseGenerator = responseGenerator; UserVmResponse userVmResponse = Mockito.mock(UserVmResponse.class); - //List list = Mockito.mock(UserVmResponse.class); - //list.add(userVmResponse); - //LinkedList mockedList = Mockito.mock(LinkedList.class); - //Mockito.when(mockedList.get(0)).thenReturn(userVmResponse); List list = new LinkedList(); list.add(userVmResponse); diff --git a/core/src/main/java/com/cloud/network/HAProxyConfigurator.java b/core/src/main/java/com/cloud/network/HAProxyConfigurator.java index e4b0a7ffff4c..21541a1602ac 100644 --- a/core/src/main/java/com/cloud/network/HAProxyConfigurator.java +++ b/core/src/main/java/com/cloud/network/HAProxyConfigurator.java @@ -597,9 +597,6 @@ public String[] generateConfiguration(final LoadBalancerConfigCommand lbCmd) { } } result.addAll(gSection); - // TODO decide under what circumstances these options are needed - // result.add("\tnokqueue"); - // result.add("\tnopoll"); result.add(blankLine); final List dSection = Arrays.asList(defaultsSection); diff --git a/core/src/test/java/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java b/core/src/test/java/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java index 201242564ba6..4196587cc3f2 100644 --- a/core/src/test/java/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java +++ b/core/src/test/java/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java @@ -417,8 +417,6 @@ private void verifyArgs(final SetNetworkACLCommand cmd, final String script, fin // FIXME Check the json content assertEquals(VRScripts.UPDATE_CONFIG, script); assertEquals(VRScripts.NETWORK_ACL_CONFIG, args); - // assertEquals(args, " -d eth3 -M 01:23:45:67:89:AB -i 192.168.1.1 -m 24 -a Egress:ALL:0:0:192.168.0.1/24-192.168.0.2/24:ACCEPT:," + - // "Ingress:ICMP:0:0:192.168.0.1/24-192.168.0.2/24:DROP:,Ingress:TCP:20:80:192.168.0.1/24-192.168.0.2/24:ACCEPT:,"); break; case 2: assertEquals(VRScripts.UPDATE_CONFIG, script); @@ -464,8 +462,6 @@ protected SetupGuestNetworkCommand generateSetupGuestNetworkCommand() { private void verifyArgs(final SetupGuestNetworkCommand cmd, final String script, final String args) { // TODO Check the contents of the json file - //assertEquals(script, VRScripts.VPC_GUEST_NETWORK); - //assertEquals(args, " -C -M 01:23:45:67:89:AB -d eth4 -i 10.1.1.2 -g 10.1.1.1 -m 24 -n 10.1.1.0 -s 8.8.8.8,8.8.4.4 -e cloud.test"); } @Test diff --git a/engine/components-api/src/main/java/com/cloud/vm/VmWorkSerializer.java b/engine/components-api/src/main/java/com/cloud/vm/VmWorkSerializer.java index bd6b52d261fa..e4fdc0c4f375 100644 --- a/engine/components-api/src/main/java/com/cloud/vm/VmWorkSerializer.java +++ b/engine/components-api/src/main/java/com/cloud/vm/VmWorkSerializer.java @@ -61,7 +61,6 @@ public static String serialize(VmWork work) { // use java binary serialization instead // return JobSerializerHelper.toObjectSerializedString(work); - // return s_gson.toJson(work); } public static T deserialize(Class clazz, String workInJsonText) { @@ -69,6 +68,5 @@ public static T deserialize(Class clazz, String workInJson // use java binary serialization instead // return (T)JobSerializerHelper.fromObjectSerializedString(workInJsonText); - // return (T)s_gson.fromJson(workInJsonText, clazz); } } diff --git a/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java index dc7852ed82b7..aea282d3d105 100644 --- a/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java +++ b/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java @@ -1627,7 +1627,6 @@ protected void processRequest(final Link link, final Request request) { final String reason = shutdown.getReason(); logger.info("Host {} has informed us that it is shutting down with reason {} and detail {}", attache, reason, shutdown.getDetail()); if (reason.equals(ShutdownCommand.Update)) { - // disconnectWithoutInvestigation(attache, Event.UpdateNeeded); throw new CloudRuntimeException("Agent update not implemented"); } else if (reason.equals(ShutdownCommand.Requested)) { disconnectWithoutInvestigation(attache, Event.ShutdownRequested); @@ -1728,7 +1727,6 @@ protected void doTask(final Task task) throws TaskExecutionException { } } catch (final UnsupportedVersionException e) { logger.warn(e.getMessage()); - // upgradeAgent(task.getLink(), data, e.getReason()); } catch (final ClassNotFoundException e) { final String message = String.format("Exception occurred when executing tasks! Error '%s'", e.getMessage()); logger.error(message); diff --git a/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java index a7dca34f0321..cbe9a7b5a1f5 100644 --- a/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java +++ b/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java @@ -962,7 +962,6 @@ protected void runInContext() { synchronized (_agentToTransferIds) { if (!_agentToTransferIds.isEmpty()) { logger.debug("Found {} agents to transfer", _agentToTransferIds.size()); - // for (Long hostId : _agentToTransferIds) { for (final Iterator iterator = _agentToTransferIds.iterator(); iterator.hasNext(); ) { final Long hostId = iterator.next(); final AgentAttache attache = findAttache(hostId); diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java index 2ad8d15d0b71..7f6571becc83 100644 --- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java +++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java @@ -213,7 +213,6 @@ public EngineHostDaoImpl() { SequenceSearch = createSearchBuilder(); SequenceSearch.and("id", SequenceSearch.entity().getId(), SearchCriteria.Op.EQ); - // SequenceSearch.addRetrieve("sequence", SequenceSearch.entity().getSequence()); SequenceSearch.done(); DirectlyConnectedSearch = createSearchBuilder(); diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java index d9a79f9885b4..cb63c3c2d97a 100644 --- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java +++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java @@ -1574,12 +1574,8 @@ public void prepareForMigration(VirtualMachineProfile vm, DeployDestination dest vm.addDisk(disk); } - //if (vm.getType() == VirtualMachine.Type.User && vm.getTemplate().getFormat() == ImageFormat.ISO) { if (vm.getType() == VirtualMachine.Type.User) { _tmpltMgr.prepareIsoForVmProfile(vm, dest); - //DataTO dataTO = tmplFactory.getTemplate(vm.getTemplate().getId(), DataStoreRole.Image, vm.getVirtualMachine().getDataCenterId()).getTO(); - //DiskTO iso = new DiskTO(dataTO, 3L, null, Volume.Type.ISO); - //vm.addDisk(iso); } } diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java index 51e87663919b..ff75aa0cbb65 100644 --- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java +++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java @@ -140,20 +140,12 @@ public List listHosts() { @Override public List listPods() { - /* - * Not in use now, just commented out. - */ - //List pods = new ArrayList(); - //pods.add(new PodEntityImpl("pod-uuid-1", "pod1")); - //pods.add(new PodEntityImpl("pod-uuid-2", "pod2")); return null; } @Override public List listZones() { List zones = new ArrayList(); - //zones.add(new ZoneEntityImpl("zone-uuid-1")); - //zones.add(new ZoneEntityImpl("zone-uuid-2")); return zones; } diff --git a/engine/schema/src/main/java/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java index 02a7ac6977c2..76058d213338 100644 --- a/engine/schema/src/main/java/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java @@ -36,7 +36,6 @@ public class ClusterVSMMapDaoImpl extends GenericDaoBase final SearchBuilder VsmSearch; public ClusterVSMMapDaoImpl() { - //super(); ClusterSearch = createSearchBuilder(); ClusterSearch.and("clusterId", ClusterSearch.entity().getClusterId(), SearchCriteria.Op.EQ); @@ -82,8 +81,6 @@ public boolean remove(Long id) { TransactionLegacy txn = TransactionLegacy.currentTxn(); txn.start(); ClusterVSMMapVO cluster = createForUpdate(); - //cluster.setClusterId(null); - //cluster.setVsmId(null); update(id, cluster); diff --git a/engine/schema/src/main/java/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java index 9a9ca80bce59..7ed0ad0bcc54 100644 --- a/engine/schema/src/main/java/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java @@ -76,7 +76,6 @@ public VmRulesetLogVO findByVmId(long vmId) { @Override public int createOrUpdate(Set workItems) { - //return createOrUpdateUsingBatch(workItems); return createOrUpdateUsingMultiInsert(workItems); } diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDaoImpl.java index 138677927e6e..24db83c4e7b7 100644 --- a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDaoImpl.java @@ -99,7 +99,6 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem private SearchBuilder PublicIsoSearch; private SearchBuilder UserIsoSearch; private GenericSearchBuilder CountTemplatesByAccount; - // private SearchBuilder updateStateSearch; private SearchBuilder AllFieldsSearch; protected SearchBuilder ParentTemplateIdSearch; private SearchBuilder InactiveUnremovedTmpltSearch; @@ -403,12 +402,6 @@ public boolean configure(String name, Map params) throws Configu CountTemplatesByAccount.and("state", CountTemplatesByAccount.entity().getState(), SearchCriteria.Op.EQ); CountTemplatesByAccount.done(); - // updateStateSearch = this.createSearchBuilder(); - // updateStateSearch.and("id", updateStateSearch.entity().getId(), Op.EQ); - // updateStateSearch.and("state", updateStateSearch.entity().getState(), Op.EQ); - // updateStateSearch.and("updatedCount", updateStateSearch.entity().getUpdatedCount(), Op.EQ); - // updateStateSearch.done(); - AllFieldsSearch = createSearchBuilder(); AllFieldsSearch.and("state", AllFieldsSearch.entity().getState(), SearchCriteria.Op.EQ); AllFieldsSearch.and("accountId", AllFieldsSearch.entity().getAccountId(), SearchCriteria.Op.EQ); diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2214to30.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2214to30.java index 524b6a34893b..d4cdbcb9707d 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2214to30.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2214to30.java @@ -77,8 +77,6 @@ public void performDataMigration(Connection conn) { encryptData(conn); // drop keys dropKeysIfExist(conn); - //update template ID for system Vms - //updateSystemVms(conn); This is not required as system template update is handled during 4.2 upgrade // update domain network ref updateDomainNetworkRef(conn); // update networks that use redundant routers to the new network offering diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade302to40.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade302to40.java index aa427252585f..bd8ddaa7c498 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade302to40.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade302to40.java @@ -62,7 +62,6 @@ public InputStream[] getPrepareScripts() { @Override public void performDataMigration(Connection conn) { - //updateVmWareSystemVms(conn); This is not required as system template update is handled during 4.2 upgrade correctVRProviders(conn); correctMultiplePhysicaNetworkSetups(conn); addHostDetailsUniqueKey(conn); diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade304to305.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade304to305.java index bb4c73f67b68..21c016c7cc1d 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade304to305.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade304to305.java @@ -65,7 +65,6 @@ public void performDataMigration(Connection conn) { addVpcProvider(conn); updateRouterNetworkRef(conn); fixZoneUsingExternalDevices(conn); -// updateSystemVms(conn); fixForeignKeys(conn); encryptClusterDetails(conn); } @@ -81,54 +80,6 @@ public InputStream[] getCleanupScripts() { return new InputStream[] {script}; } - private void updateSystemVms(Connection conn) { - PreparedStatement pstmt = null; - ResultSet rs = null; - boolean VMware = false; - try { - pstmt = conn.prepareStatement("select distinct(hypervisor_type) from `cloud`.`cluster` where removed is null"); - rs = pstmt.executeQuery(); - while (rs.next()) { - if ("VMware".equals(rs.getString(1))) { - VMware = true; - } - } - } catch (SQLException e) { - throw new CloudRuntimeException("Error while iterating through list of hypervisors in use", e); - } - // Just update the VMware system template. Other hypervisor templates are unchanged from previous 3.0.x versions. - logger.debug("Updating VMware System Vms"); - try { - //Get 3.0.5 VMware system Vm template Id - pstmt = conn.prepareStatement("select id from `cloud`.`vm_template` where name = 'systemvm-vmware-3.0.5' and removed is null"); - rs = pstmt.executeQuery(); - if (rs.next()) { - long templateId = rs.getLong(1); - rs.close(); - pstmt.close(); - // change template type to SYSTEM - pstmt = conn.prepareStatement("update `cloud`.`vm_template` set type='SYSTEM' where id = ?"); - pstmt.setLong(1, templateId); - pstmt.executeUpdate(); - pstmt.close(); - // update template ID of system Vms - pstmt = conn.prepareStatement("update `cloud`.`vm_instance` set vm_template_id = ? where type <> 'User' and hypervisor_type = 'VMware'"); - pstmt.setLong(1, templateId); - pstmt.executeUpdate(); - pstmt.close(); - } else { - if (VMware) { - throw new CloudRuntimeException("3.0.5 VMware SystemVm template not found. Cannot upgrade system Vms"); - } else { - logger.warn("3.0.5 VMware SystemVm template not found. VMware hypervisor is not used, so not failing upgrade"); - } - } - } catch (SQLException e) { - throw new CloudRuntimeException("Error while updating VMware systemVm template", e); - } - logger.debug("Updating System Vm Template IDs Complete"); - } - private void addVpcProvider(Connection conn) { //Encrypt config params and change category to Hidden logger.debug("Adding vpc provider to all physical networks in the system"); diff --git a/engine/schema/src/main/java/com/cloud/user/UserAccountVO.java b/engine/schema/src/main/java/com/cloud/user/UserAccountVO.java index e4fcbad6b02f..c5ca410fc530 100644 --- a/engine/schema/src/main/java/com/cloud/user/UserAccountVO.java +++ b/engine/schema/src/main/java/com/cloud/user/UserAccountVO.java @@ -226,10 +226,6 @@ public Date getCreated() { return created; } -// public void setCreated(Date created) { -// this.created = created; -// } - @Override public Date getRemoved() { return removed; diff --git a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java index d57dec8fbfd5..c475a4203a73 100644 --- a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java +++ b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java @@ -209,10 +209,8 @@ public VolumeDataStoreVO(long hostId, long volumeId) { public VolumeDataStoreVO(long hostId, long volumeId, Date lastUpdated, int downloadPercent, Status downloadState, String localDownloadPath, String errorString, String jobId, String installPath, String downloadUrl, String checksum) { - // super(); dataStoreId = hostId; this.volumeId = volumeId; - // this.zoneId = zoneId; this.lastUpdated = lastUpdated; this.downloadPercent = downloadPercent; this.downloadState = downloadState; diff --git a/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRU.java b/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRU.java index fc432ac020d6..7042ee453334 100644 --- a/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRU.java +++ b/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRU.java @@ -62,7 +62,6 @@ public void initialize() { /* Avoid using configDao at this time, we can't be sure that the database is already upgraded * and there might be fatal errors when using a dao. */ - //unusedTimeInterval = NumbersUtil.parseInt(configDao.getValue(Config.StorageCacheReplacementLRUTimeInterval.key()), 30); } public void setUnusedTimeInterval(Integer interval) { diff --git a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeServiceTest.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeServiceTest.java index 5ed0cc3f1fa4..7a872571d09d 100644 --- a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeServiceTest.java +++ b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeServiceTest.java @@ -86,8 +86,6 @@ @ContextConfiguration(locations = {"classpath:/storageContext.xml"}) public class VolumeServiceTest extends CloudStackTestNGBase { - // @Inject - // ImageDataStoreProviderManager imageProviderMgr; @Inject TemplateService imageService; @Inject @@ -231,23 +229,7 @@ private TemplateInfo createTemplate() { DataStore store = createImageStore(); VMTemplateVO image = createImageData(); TemplateInfo template = imageDataFactory.getTemplate(image.getId(), store); - // AsyncCallFuture future = - // imageService.createTemplateAsync(template, store); - // future.get(); template = imageDataFactory.getTemplate(image.getId(), store); - /* - * imageProviderMgr.configure("image Provider", new HashMap()); VMTemplateVO image = createImageData(); - * ImageDataStoreProvider defaultProvider = - * imageProviderMgr.getProvider("DefaultProvider"); - * ImageDataStoreLifeCycle lifeCycle = - * defaultProvider.getLifeCycle(); ImageDataStore store = - * lifeCycle.registerDataStore("defaultHttpStore", new - * HashMap()); - * imageService.registerTemplate(image.getId(), - * store.getImageDataStoreId()); TemplateEntity te = - * imageService.getTemplateEntity(image.getId()); return te; - */ return template; } catch (Exception e) { Assert.fail("failed", e); @@ -332,30 +314,6 @@ public DataStore createPrimaryDataStore() { ClusterScope scope = new ClusterScope(clusterId, podId, dcId); lifeCycle.attachCluster(store, scope); - /* - * PrimaryDataStoreProvider provider = - * primaryDataStoreProviderMgr.getDataStoreProvider - * ("sample primary data store provider"); - * primaryDataStoreProviderMgr.configure("primary data store mgr", - * new HashMap()); - * - * List ds = - * primaryStoreDao.findPoolByName(this.primaryName); if (ds.size() - * >= 1) { PrimaryDataStoreVO store = ds.get(0); if - * (store.getRemoved() == null) { return - * provider.getDataStore(store.getId()); } } - * - * - * Map params = new HashMap(); - * params.put("url", this.getPrimaryStorageUrl()); - * params.put("dcId", dcId.toString()); params.put("clusterId", - * clusterId.toString()); params.put("name", this.primaryName); - * PrimaryDataStoreInfo primaryDataStoreInfo = - * provider.registerDataStore(params); PrimaryDataStoreLifeCycle lc - * = primaryDataStoreInfo.getLifeCycle(); ClusterScope scope = new - * ClusterScope(clusterId, podId, dcId); lc.attachCluster(scope); - * return primaryDataStoreInfo; - */ return store; } catch (Exception e) { return null; @@ -375,7 +333,6 @@ public void createVolumeFromTemplate() { TemplateInfo te = createTemplate(); VolumeVO volume = createVolume(te.getId(), primaryStore.getId()); VolumeInfo vol = volumeFactory.getVolume(volume.getId(), primaryStore); - // ve.createVolumeFromTemplate(primaryStore.getId(), new VHD(), te); AsyncCallFuture future = volumeService.createVolumeFromTemplateAsync(vol, primaryStore.getId(), te); try { future.get(); diff --git a/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotStrategyKVMTest.java b/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotStrategyKVMTest.java index 609a1225118a..b90225cb1534 100644 --- a/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotStrategyKVMTest.java +++ b/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotStrategyKVMTest.java @@ -235,7 +235,6 @@ public void testRevertDiskSnapshot() throws Exception { when(vol.getDataStore()).thenReturn(dataStore); when(snapshotVO.getId()).thenReturn(1L); when(_snapshotService.revertSnapshot(snapshotVO.getId())).thenReturn(snap); - // testFindSnapshotByName(name); vmStrategy.revertDiskSnapshot(vmSnapshot); } diff --git a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java index 3a7b7da77684..cdc187492e53 100644 --- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java +++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java @@ -722,7 +722,6 @@ protected Void managedCopyBaseImageCallback(AsyncCallbackDispatcher + * GlobalLock lock = GlobalLock.getInternLock("some table name" + rowId); + * + * if(lock.lock()) { + * try { + * do something + * } finally { + * lock.unlock(); + * } + * } + * lock.releaseRef(); + *

+ */ public class GlobalLock { protected Logger logger = LogManager.getLogger(getClass()); diff --git a/framework/db/src/test/java/com/cloud/utils/db/TransactionContextBuilderTest.java b/framework/db/src/test/java/com/cloud/utils/db/TransactionContextBuilderTest.java index a0f7c803e4b8..3ec635c15d98 100644 --- a/framework/db/src/test/java/com/cloud/utils/db/TransactionContextBuilderTest.java +++ b/framework/db/src/test/java/com/cloud/utils/db/TransactionContextBuilderTest.java @@ -41,9 +41,6 @@ public class TransactionContextBuilderTest { @Test public void test() { - // _derived.DbAnnotatedMethod(); - // _base.MethodWithClassDbAnnotated(); - // test @DB injection on dynamically constructed objects DbAnnotatedBase base = ComponentContext.inject(new DbAnnotatedBase()); base.MethodWithClassDbAnnotated(); diff --git a/framework/ipc/src/test/java/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java b/framework/ipc/src/test/java/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java index 164852af4e76..a1410b5c00ba 100644 --- a/framework/ipc/src/test/java/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java +++ b/framework/ipc/src/test/java/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java @@ -20,6 +20,8 @@ import java.util.concurrent.ExecutionException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -36,6 +38,7 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = "classpath:/SampleManagementServerAppContext.xml") public class AsyncSampleEventDrivenStyleCaller { + protected Logger logger = LogManager.getLogger(getClass()); private AsyncSampleCallee _ds; AsyncCallbackDriver _callbackDriver; @@ -53,12 +56,8 @@ public void MethodThatWillCallAsyncMethod() { try { String result = future.get(); Assert.assertEquals(result, vol); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (ExecutionException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + } catch (InterruptedException | ExecutionException e) { + logger.error(e); } } @@ -87,10 +86,8 @@ public String getResult() { if (!this.finished) { try { this.wait(); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + logger.error(e); } } return this.result; diff --git a/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobJoinMapDaoImpl.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobJoinMapDaoImpl.java index da7ba36c919f..09a88939492e 100644 --- a/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobJoinMapDaoImpl.java +++ b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobJoinMapDaoImpl.java @@ -44,8 +44,6 @@ public class AsyncJobJoinMapDaoImpl extends GenericDaoBase CompleteJoinSearch; private final SearchBuilder WakeupSearch; -// private final GenericSearchBuilder JoinJobSearch; - protected AsyncJobJoinMapDaoImpl() { RecordSearch = createSearchBuilder(); RecordSearch.and("jobId", RecordSearch.entity().getJobId(), Op.EQ); @@ -65,10 +63,6 @@ protected AsyncJobJoinMapDaoImpl() { WakeupSearch.and("expiration", WakeupSearch.entity().getExpiration(), Op.GT); WakeupSearch.and("joinStatus", WakeupSearch.entity().getJoinStatus(), Op.EQ); WakeupSearch.done(); - -// JoinJobSearch = createSearchBuilder(Long.class); -// JoinJobSearch.and(JoinJobSearch.entity().getJoinJobId(), Op.SC, "joinJobId"); -// JoinJobSearch.done(); } @Override @@ -148,64 +142,6 @@ public void completeJoin(long joinJobId, JobInfo.Status joinStatus, String joinR update(ub, sc, null); } -// @Override -// public List wakeupScan() { -// List standaloneList = new ArrayList(); -// -// Date cutDate = DateUtil.currentGMTTime(); -// -// TransactionLegacy txn = TransactionLegacy.currentTxn(); -// PreparedStatement pstmt = null; -// try { -// txn.start(); -// -// // -// // performance sensitive processing, do it in plain SQL -// // -// String sql = "UPDATE async_job SET job_pending_signals=? WHERE id IN " + -// "(SELECT job_id FROM async_job_join_map WHERE next_wakeup < ? AND expiration > ?)"; -// pstmt = txn.prepareStatement(sql); -// pstmt.setInt(1, AsyncJob.Constants.SIGNAL_MASK_WAKEUP); -// pstmt.setString(2, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), cutDate)); -// pstmt.setString(3, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), cutDate)); -// pstmt.executeUpdate(); -// pstmt.close(); -// -// sql = "UPDATE sync_queue_item SET queue_proc_msid=NULL, queue_proc_number=NULL WHERE content_id IN " + -// "(SELECT job_id FROM async_job_join_map WHERE next_wakeup < ? AND expiration > ?)"; -// pstmt = txn.prepareStatement(sql); -// pstmt.setString(1, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), cutDate)); -// pstmt.setString(2, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), cutDate)); -// pstmt.executeUpdate(); -// pstmt.close(); -// -// sql = "SELECT job_id FROM async_job_join_map WHERE next_wakeup < ? AND expiration > ? AND job_id NOT IN (SELECT content_id FROM sync_queue_item)"; -// pstmt = txn.prepareStatement(sql); -// pstmt.setString(1, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), cutDate)); -// pstmt.setString(2, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), cutDate)); -// ResultSet rs = pstmt.executeQuery(); -// while(rs.next()) { -// standaloneList.add(rs.getLong(1)); -// } -// rs.close(); -// pstmt.close(); -// -// // update for next wake-up -// sql = "UPDATE async_job_join_map SET next_wakeup=DATE_ADD(next_wakeup, INTERVAL wakeup_interval SECOND) WHERE next_wakeup < ? AND expiration > ?"; -// pstmt = txn.prepareStatement(sql); -// pstmt.setString(1, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), cutDate)); -// pstmt.setString(2, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), cutDate)); -// pstmt.executeUpdate(); -// pstmt.close(); -// -// txn.commit(); -// } catch (SQLException e) { -// logger.error("Unexpected exception", e); -// } -// -// return standaloneList; -// } - @Override public List findJobsToWake(long joinedJobId) { // TODO: We should fix this. We shouldn't be crossing daos in a dao code. diff --git a/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/JobSerializerHelper.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/JobSerializerHelper.java index fa1d175c45f9..66df95426d56 100644 --- a/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/JobSerializerHelper.java +++ b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/JobSerializerHelper.java @@ -193,7 +193,6 @@ public JsonElement serialize(Throwable th, Type type, JsonSerializationContext c json.add("class", new JsonPrimitive(th.getClass().getName())); json.add("cause", s_gson.toJsonTree(th.getCause())); json.add("msg", new JsonPrimitive(th.getMessage())); -// json.add("stack", s_gson.toJsonTree(th.getStackTrace())); return json; } diff --git a/plugins/api/rate-limit/src/test/java/org/apache/cloudstack/ratelimit/integration/APITest.java b/plugins/api/rate-limit/src/test/java/org/apache/cloudstack/ratelimit/integration/APITest.java index efe8c53a51b1..eb020c2c499a 100644 --- a/plugins/api/rate-limit/src/test/java/org/apache/cloudstack/ratelimit/integration/APITest.java +++ b/plugins/api/rate-limit/src/test/java/org/apache/cloudstack/ratelimit/integration/APITest.java @@ -189,7 +189,6 @@ protected Object fromSerializedString(String result, Class repCls) { * @return login response string */ protected void login(String username, String password) { - //String md5Psw = createMD5String(password); // send login request HashMap params = new HashMap(); params.put("response", "json"); diff --git a/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java index 99bedbff05e1..9bdc2fb9ed86 100644 --- a/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java +++ b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java @@ -149,7 +149,6 @@ public boolean addVirtualMachineIntoNetwork(Network network, NicProfile nic, Vir String errMsg = String.format("Set dhcp entry on external DHCP %1$s failed(ip=%2$s, mac=%3$s, vmname=%4$s)", h.getPrivateIpAddress(), nic.getIPv4Address(), nic.getMacAddress(), profile.getVirtualMachine().getHostName()); - // prepareBareMetalDhcpEntry(nic, dhcpCommand); try { Answer ans = _agentMgr.send(h.getId(), dhcpCommand); if (ans.getResult()) { diff --git a/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/Test.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/Test.java index cd1b14eeaa15..32960a9616c6 100644 --- a/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/Test.java +++ b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/object/Test.java @@ -23,37 +23,6 @@ public class Test { public static void main(final String[] args) { try { - /*Connection c = new Connection("192.168.105.155", "oracle", "password"); - Utils util = new UtilsImpl(c); - Storage storage = new StorageImpl(c); - String[] res = util.listDir("/etc", 1); - for (String s : res) { - System.out.println(s); - } - - - Pool pool = new PoolImpl(c); - - //pool.registerServer("192.168.105.155", Pool.ServerType.SITE); - //pool.registerServer("192.168.105.155", Pool.ServerType.UTILITY); - //pool.registerServer("192.168.105.155", Pool.ServerType.XEN); - System.out.println("Is:" + pool.isServerRegistered()); - System.out.println(pool.getServerConfig()); - System.out.println(pool.getServerXmInfo()); - System.out.println(pool.getHostInfo()); - System.out.println(pool.getAgentVersion()); - String[] srs = storage.listSr(); - for (int i=0; i spaceInfo = storage.getSrSpaceInfo("192.168.110.232:/export/frank/nfs"); - System.out.println("Total:" + spaceInfo.first()); - System.out.println("Free:" + spaceInfo.second());*/ final OvmVm.Details vm = new OvmVm.Details(); vm.cpuNum = 1; vm.memory = 512; @@ -80,23 +49,7 @@ public static void main(final String[] args) { vm.vifs.add(vif); vm.vifs.add(vif); vm.vifs.add(vif); - //System.out.println(vm.toJson()); final Connection c = new Connection("192.168.189.12", "oracle", "password"); - //System.out.println(Coder.toJson(OvmHost.getDetails(c))); - - /* This is not being used at the moment. - * Coverity issue: 1012179 - */ - - //OvmHost.Details d = new GsonBuilder().create().fromJson(txt, OvmHost.Details.class); - //OvmHost.Details d = Coder.fromJson(txt, OvmHost.Details.class); - //OvmHost.Details d = OvmHost.getDetails(c); - //System.out.println(Coder.toJson(d)); - // OvmStoragePool.Details pool = new OvmStoragePool.Details(); - // pool.path = "192.168.110.232:/export/frank/ovs"; - // pool.type = OvmStoragePool.NFS; - // pool.uuid = "123"; - // System.out.println(pool.toJson()); String cmd = null; System.out.println(args.length); @@ -119,15 +72,10 @@ public static void main(final String[] args) { System.out.println(d.toJson()); if (cmd.equalsIgnoreCase("create")) { - // String s = - // "{\"cpuNum\":1,\"memory\":512,\"rootDisk\":{\"type\":\"w\",\"path\":\"/var/ovs/mount/60D0985974CA425AAF5D01A1F161CC8B/running_pool/36_systemvm/System.img\"},\"disks\":[],\"vifs\":[{\"mac\":\"00:16:3E:5C:B1:D1\",\"bridge\":\"xenbr0\",\"type\":\"netfront\"}],\"name\":\"MyTest\",\"uuid\":\"1-2-3-4-5\"}"; OvmVm.create(c, d); - // c.call("OvmVm.echo", new Object[]{s}); } else if (cmd.equalsIgnoreCase("reboot")) { final Map res = OvmVm.reboot(c, "MyTest"); System.out.println(res.get("vncPort")); - //OvmVm.stop(c, "MyTest"); - //OvmVm.create(c, d); } else if (cmd.equalsIgnoreCase("stop")) { OvmVm.stop(c, "MyTest"); } else if (cmd.equalsIgnoreCase("details")) { @@ -166,12 +114,6 @@ public static void main(final String[] args) { l.add("4b4d8951-f0b6-36c5-b4f3-a82ff2611c65"); System.out.println(Coder.toJson(l)); - // Map res = OvmHost.getPerformanceStats(c, "xenbr0"); - // System.out.println(res.toString()); - // String stxt = "{\"vifs\": [{\"bridge\": \"xenbr0\", \"mac\": \"00:16:3E:5C:B1:D1\", \"type\": \"netfront\"}], \"powerState\": \"RUNNING\", \"disks\": [], \"cpuNum\": 1, \"memory\": 536870912, \"rootDisk\": {\"path\": \"/var/ovs/mount/60D0985974CA425AAF5D01A1F161CC8B/running_pool/MyTest/System.img\", \"type\": \"w\"}}"; - // OvmVm.Details ddd = Coder.fromJson(stxt, OvmVm.Details.class); - // System.out.println(ddd.vifs.size()); - // System.out.println(ddd.rootDisk.path); } catch (final Exception e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareCleanupMaid.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareCleanupMaid.java index d2c71c4ee01a..49f10970e7c8 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareCleanupMaid.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareCleanupMaid.java @@ -65,15 +65,6 @@ public VmwareCleanupMaid(String vCenterAddress, String dcMorValue, String vmName _vmName = vmName; } -// @Override -// public int cleanup(CheckPointManager checkPointMgr) { -// -// // save a check-point in case we crash at current run so that we won't lose it -// _checkPoint = checkPointMgr.pushCheckPoint(new VmwareCleanupMaid(_vCenterAddress, _dcMorValue, _vmName)); -// addLeftOverVM(this); -// return 0; -// } - public String getCleanupProcedure() { return null; } diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java index beac489acdb3..73d63f04c5f4 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java @@ -66,9 +66,7 @@ public abstract class CiscoNexusVSMDeviceManagerImpl extends AdapterBase { @DB - //public CiscoNexusVSMDeviceVO addCiscoNexusVSM(long clusterId, String ipaddress, String username, String password, ServerResource resource, String vsmName) { - public - CiscoNexusVSMDeviceVO addCiscoNexusVSM(long clusterId, String ipaddress, String username, String password, String vCenterIpaddr, String vCenterDcName) { + public CiscoNexusVSMDeviceVO addCiscoNexusVSM(long clusterId, String ipaddress, String username, String password, String vCenterIpaddr, String vCenterDcName) { // In this function, we associate this VSM with each host // in the clusterId specified. @@ -154,28 +152,6 @@ CiscoNexusVSMDeviceVO addCiscoNexusVSM(long clusterId, String ipaddress, String // into each host's resource. Also, we first configure each resource's // entries in the database to contain this VSM information before the injection. - //for (HostVO host : hosts) { - // Create a host details VO object and write it out for this hostid. - //Long hostid = new Long(vsmId); - //DetailVO vsmDetail = new DetailVO(host.getId(), "vsmId", hostid.toString()); - //Transaction tx = Transaction.currentTxn(); - //try { - //tx.start(); - //_hostDetailDao.persist(vsmDetail); - //tx.commit(); - //} catch (Exception e) { - //tx.rollback(); - //throw new CloudRuntimeException(e.getMessage()); - //} - //} - // Reconfigure the resource. - //Map hostDetails = new HashMap(); - //hostDetails.put(ApiConstants.ID, vsmId); - //hostDetails.put(ApiConstants.IP_ADDRESS, ipaddress); - //hostDetails.put(ApiConstants.USERNAME, username); - //hostDetails.put(ApiConstants.PASSWORD, password); - //_agentMrg.send(host.getId(), ) - return VSMObj; } diff --git a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapperTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapperTest.java index d464a2664935..b9504b6648a3 100755 --- a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapperTest.java +++ b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapperTest.java @@ -576,37 +576,6 @@ public void testMaintainCommand() { fail(e.getMessage()); } - // try { - // PowerMockito.mockStatic(Host.class); - // //BDDMockito.given(Host.getByUuid(conn, - // xsHost.getUuid())).willReturn(host); - // PowerMockito.when(Host.getByUuid(conn, - // xsHost.getUuid())).thenReturn(host); - // PowerMockito.verifyStatic(times(1)); - // } catch (final BadServerResponse e) { - // fail(e.getMessage()); - // } catch (final XenAPIException e) { - // fail(e.getMessage()); - // } catch (final XmlRpcException e) { - // fail(e.getMessage()); - // } - // - // PowerMockito.mockStatic(Types.class); - // PowerMockito.when(Types.toHostRecord(spiedMap)).thenReturn(hr); - // PowerMockito.verifyStatic(times(1)); - // - // try { - // PowerMockito.mockStatic(Host.Record.class); - // when(host.getRecord(conn)).thenReturn(hr); - // verify(host, times(1)).getRecord(conn); - // } catch (final BadServerResponse e) { - // fail(e.getMessage()); - // } catch (final XenAPIException e) { - // fail(e.getMessage()); - // } catch (final XmlRpcException e) { - // fail(e.getMessage()); - // } - final Answer answer = wrapper.execute(maintainCommand, citrixResourceBase); assertFalse(answer.getResult()); diff --git a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer610WrapperTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer610WrapperTest.java index 4b2dd1ac3ec6..d5e794d2899f 100644 --- a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer610WrapperTest.java +++ b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer610WrapperTest.java @@ -462,17 +462,6 @@ public void testXenServer610MigrateVolumeCommandWrapper() { verify(xenServer610Resource, times(1)).getConnection(); - // try { - // verify(xenServer610Resource, times(1)).waitForTask(conn, task, 1000, timeout); - // verify(xenServer610Resource, times(1)).checkForSuccess(conn, task); - // } catch (final XenAPIException e) { - // fail(e.getMessage()); - // } catch (final XmlRpcException e) { - // fail(e.getMessage()); - // } catch (final TimeoutException e) { - // fail(e.getMessage()); - // } - assertFalse(answer.getResult()); } diff --git a/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java index 90597d7b1e19..e0ab727930e8 100644 --- a/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java +++ b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java @@ -136,7 +136,6 @@ private String getXml(String filename) { String xml = ""; String line; while ((line = br.readLine()) != null) { - //xml += line.replaceAll("\n"," "); xml += line; } diff --git a/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/element/CiscoVnmcElementService.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/element/CiscoVnmcElementService.java index 8388bb89bb51..8a52893274fa 100644 --- a/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/element/CiscoVnmcElementService.java +++ b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/element/CiscoVnmcElementService.java @@ -28,8 +28,6 @@ public interface CiscoVnmcElementService extends PluggableService { - //public static final Provider CiscoVnmc = new Provider("CiscoVnmc", true); - public CiscoVnmcController addCiscoVnmcResource(AddCiscoVnmcResourceCmd cmd); public CiscoVnmcResourceResponse createCiscoVnmcResourceResponse(CiscoVnmcController ciscoVnmcResourceVO); diff --git a/plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/ElasticLbVmMapVO.java b/plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/ElasticLbVmMapVO.java index b9bad7f65754..96a43dfb19e0 100644 --- a/plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/ElasticLbVmMapVO.java +++ b/plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/ElasticLbVmMapVO.java @@ -79,10 +79,6 @@ public long getElbVmId() { return elbVmId; } -// public String getLbName() { -// return lbName; -// } - public long getIpAddressId() { return ipAddressId; } diff --git a/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java index 15f546db0f08..7e19937f45a6 100644 --- a/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java +++ b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java @@ -32,6 +32,9 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.command.admin.vlan.CreateVlanIpRangeCmd; @@ -86,6 +89,7 @@ import com.cloud.vm.dao.UserVmDao; public class ManagementServerMock { + protected Logger logger = LogManager.getLogger(getClass()); @Inject private AccountManager _accountMgr; @@ -217,15 +221,7 @@ public Object answer(InvocationOnMock invocation) { return null; } }; - try { - Mockito.when(_agentMgr.send(ArgumentMatchers.anyLong(), ArgumentMatchers.any(Commands.class))).thenAnswer(callback); - } catch (AgentUnavailableException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (OperationTimedoutException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + sendCommands(callback); long id = _userVmDao.getNextInSequence(Long.class, "id"); UserVmVO vm = new UserVmVO(id, name, name, tmpl.getId(), HypervisorType.XenServer, tmpl.getGuestOSId(), false, false, _zone.getDomainId(), Account.ACCOUNT_ID_SYSTEM, @@ -239,12 +235,21 @@ public Object answer(InvocationOnMock invocation) { try { _vmMgr.addVmToNetwork(vm, network, profile); } catch (Exception ex) { - // TODO Auto-generated catch block - //ex.printStackTrace(); + logger.warn("Exception occurred while adding VM to network: " + ex.getMessage()); } return vm; } + private void sendCommands(Answer callback) { + try { + Mockito.when(_agentMgr.send(ArgumentMatchers.anyLong(), ArgumentMatchers.any(Commands.class))).thenAnswer(callback); + } catch (AgentUnavailableException e) { + logger.warn("no agent running", e); + } catch (OperationTimedoutException e) { + logger.warn("agent not responding (in time)", e); + } + } + private void deleteHost() { _hostDao.remove(_hostId); @@ -265,15 +270,7 @@ public Object answer(InvocationOnMock invocation) { return null; } }; - - try { - Mockito.when(_agentMgr.send(ArgumentMatchers.anyLong(), ArgumentMatchers.any(Commands.class))).thenAnswer(callback); - } catch (AgentUnavailableException e) { - e.printStackTrace(); - } catch (OperationTimedoutException e) { - e.printStackTrace(); - } - + sendCommands(callback); _userVmDao.remove(vm.getId()); } diff --git a/plugins/network-elements/tungsten/src/test/java/org/apache/cloudstack/network/tungsten/service/TungstenElementTest.java b/plugins/network-elements/tungsten/src/test/java/org/apache/cloudstack/network/tungsten/service/TungstenElementTest.java index 58084d3072d1..b22d1e70be3b 100644 --- a/plugins/network-elements/tungsten/src/test/java/org/apache/cloudstack/network/tungsten/service/TungstenElementTest.java +++ b/plugins/network-elements/tungsten/src/test/java/org/apache/cloudstack/network/tungsten/service/TungstenElementTest.java @@ -778,60 +778,6 @@ public void shutdownProviderInstancesTest() throws ConcurrentOperationException verify(tungstenService, times(1)).deleteManagementNetwork(anyLong()); } - //@Test - //public void processConnectWithoutSecurityGroupTest() throws ConnectionException { - // Host host = mock(Host.class); - // StartupCommand startupCommand = mock(StartupCommand.class); - // TungstenProviderVO tungstenProvider = mock(TungstenProviderVO.class); - // DataCenterVO dataCenterVO = mock(DataCenterVO.class); - // VlanVO vlanVO1 = mock(VlanVO.class); - // VlanVO vlanVO2 = mock(VlanVO.class); - // List vlanList = Arrays.asList(vlanVO1, vlanVO2); - // Network publicNetwork = mock(Network.class); - // NetworkDetailVO networkDetail = mock(NetworkDetailVO.class); -// - // when(host.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM); - // when(tungstenProviderDao.findByZoneId(anyLong())).thenReturn(tungstenProvider); - // when(host.getPublicIpAddress()).thenReturn("192.168.100.100"); - // when(tungstenProvider.getGateway()).thenReturn("192.168.100.100"); - // when(dataCenterDao.findById(anyLong())).thenReturn(dataCenterVO); - // when(vlanDao.listByZone(anyLong())).thenReturn(vlanList); - // when(networkModel.getSystemNetworkByZoneAndTrafficType(anyLong(), eq(Networks.TrafficType.Public))).thenReturn(publicNetwork); - // when(networkDetailsDao.findDetail(anyLong(), anyString())).thenReturn(networkDetail); - // when(vlanVO1.getVlanGateway()).thenReturn("192.168.100.1"); - // when(vlanVO1.getVlanNetmask()).thenReturn("255.255.255.0"); - // when(vlanVO2.getVlanGateway()).thenReturn("192.168.101.1"); - // when(vlanVO2.getVlanNetmask()).thenReturn("255.255.255.0"); - // when(dataCenterVO.isSecurityGroupEnabled()).thenReturn(false); -// - // tungstenElement.processConnect(host, startupCommand, true); - // verify(agentManager, times(1)).easySend(anyLong(), any(SetupTungstenVRouterCommand.class)); - //} - - //@Test - //public void processConnectWithSecurityGroupTest() throws ConnectionException { - // Host host = mock(Host.class); - // StartupCommand startupCommand = mock(StartupCommand.class); - // TungstenProviderVO tungstenProvider = mock(TungstenProviderVO.class); - // DataCenterVO dataCenterVO = mock(DataCenterVO.class); - // NetworkVO network = mock(NetworkVO.class); - // NetworkDetailVO networkDetail = mock(NetworkDetailVO.class); - // Network publicNetwork = mock(Network.class); -// - // when(host.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM); - // when(tungstenProviderDao.findByZoneId(anyLong())).thenReturn(tungstenProvider); - // when(host.getPublicIpAddress()).thenReturn("192.168.100.100"); - // when(tungstenProvider.getGateway()).thenReturn("192.168.100.100"); - // when(dataCenterDao.findById(anyLong())).thenReturn(dataCenterVO); - // when(networkDao.listByZoneSecurityGroup(anyLong())).thenReturn(Arrays.asList(network)); - // when(networkDetailsDao.findDetail(anyLong(), anyString())).thenReturn(networkDetail); - // when(networkModel.getSystemNetworkByZoneAndTrafficType(anyLong(), eq(Networks.TrafficType.Public))).thenReturn(publicNetwork); - // when(dataCenterVO.isSecurityGroupEnabled()).thenReturn(true); -// - // tungstenElement.processConnect(host, startupCommand, true); - // verify(agentManager, times(1)).easySend(anyLong(), any(SetupTungstenVRouterCommand.class)); - //} - @Test public void processHostAboutToBeRemovedWithSecurityGroupTest() { HostVO hostVO = mock(HostVO.class); diff --git a/plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/driver/ElastistorPrimaryDataStoreDriver.java b/plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/driver/ElastistorPrimaryDataStoreDriver.java index 3d4afcaf95c5..9e26aa8625ae 100644 --- a/plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/driver/ElastistorPrimaryDataStoreDriver.java +++ b/plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/driver/ElastistorPrimaryDataStoreDriver.java @@ -175,9 +175,6 @@ public void createAsync(DataStore dataStore, DataObject dataObject, AsyncComplet _volumeDao.update(volume.getId(), volume); - // create new volume details for the volume - //updateVolumeDetails(volume, esvolume); - long capacityBytes = storagePool.getCapacityBytes(); long usedBytes = storagePool.getUsedBytes(); diff --git a/plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ElastistorUtil.java b/plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ElastistorUtil.java index 6650dad76775..603908e024ca 100644 --- a/plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ElastistorUtil.java +++ b/plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ElastistorUtil.java @@ -341,7 +341,6 @@ public static FileSystem createElastistorVolume(String volumeName, String tsmid, String qosgroupid; String VolumeName = volumeName; String totaliops = String.valueOf(capacityIops); - //String totalthroughput = String.valueOf(capacityIops * 4); String totalthroughput = "0"; String quotasize = convertCapacityBytes(capacityBytes); @@ -679,14 +678,6 @@ public static boolean deleteElastistorTsm(String tsmid, boolean managed) throws } LOGGER.info("tsm id is null"); return false; - - /* - * else { LOGGER.error("no volume is present in the tsm"); } } else { - * LOGGER.error( - * "List tsm failed, no tsm present in the eastistor for the given IP " - * ); return false; } return false; - */ - } public static boolean deleteElastistorVolume(String esvolumeid) throws Throwable { diff --git a/plugins/storage/volume/linstor/src/test/java/org/apache/cloudstack/storage/datastore/util/LinstorUtilTest.java b/plugins/storage/volume/linstor/src/test/java/org/apache/cloudstack/storage/datastore/util/LinstorUtilTest.java index 55f0c6ebe6dc..39d9a253c57b 100644 --- a/plugins/storage/volume/linstor/src/test/java/org/apache/cloudstack/storage/datastore/util/LinstorUtilTest.java +++ b/plugins/storage/volume/linstor/src/test/java/org/apache/cloudstack/storage/datastore/util/LinstorUtilTest.java @@ -82,7 +82,6 @@ public void setUp() throws ApiException { mockStoragePool("thinpool", "nodeC", ProviderKind.LVM_THIN) )); -// when(LinstorUtil.getLinstorAPI(LINSTOR_URL_TEST)).thenReturn(api); } @Test diff --git a/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/driver/NexentaPrimaryDataStoreDriver.java b/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/driver/NexentaPrimaryDataStoreDriver.java index 60f3bd2ac8d3..dad4819c83e2 100644 --- a/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/driver/NexentaPrimaryDataStoreDriver.java +++ b/plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/driver/NexentaPrimaryDataStoreDriver.java @@ -187,9 +187,6 @@ public void deleteAsync(DataStore store, DataObject data, AsyncCompletionCallbac NexentaStorAppliance appliance = getNexentaStorAppliance(storagePoolId); StoragePoolVO storagePool = _storagePoolDao.findById(storagePoolId); - - -// _storagePoolDao.update(stoagePoolId); } else { errorMessage = String.format( "Invalid DataObjectType(%s) passed to deleteAsync", diff --git a/plugins/storage/volume/nexenta/src/test/java/org/apache/cloudstack/storage/datastore/util/NexentaStorApplianceTest.java b/plugins/storage/volume/nexenta/src/test/java/org/apache/cloudstack/storage/datastore/util/NexentaStorApplianceTest.java index 89b5ece576ff..d283e4c35d74 100644 --- a/plugins/storage/volume/nexenta/src/test/java/org/apache/cloudstack/storage/datastore/util/NexentaStorApplianceTest.java +++ b/plugins/storage/volume/nexenta/src/test/java/org/apache/cloudstack/storage/datastore/util/NexentaStorApplianceTest.java @@ -60,7 +60,6 @@ public class NexentaStorApplianceTest { public void init() { final String url = "nmsUrl=https://admin:nexenta@10.1.3.182:8457;volume=cloudstack;storageType=iscsi"; NexentaUtil.NexentaPluginParameters parameters = NexentaUtil.parseNexentaPluginUrl(url); - //client = new NexentaNmsClient(parameters.getNmsUrl()); client = mock(NexentaNmsClient.class); appliance = new NexentaStorAppliance(client, parameters); } diff --git a/plugins/storage/volume/solidfire/src/test/java/org/apache/cloudstack/storage/test/VolumeTest.java b/plugins/storage/volume/solidfire/src/test/java/org/apache/cloudstack/storage/test/VolumeTest.java index 08f95b15d136..d721412b3ec1 100644 --- a/plugins/storage/volume/solidfire/src/test/java/org/apache/cloudstack/storage/test/VolumeTest.java +++ b/plugins/storage/volume/solidfire/src/test/java/org/apache/cloudstack/storage/test/VolumeTest.java @@ -64,8 +64,6 @@ public class VolumeTest { DataCenterDao dcDao; @Inject PrimaryDataStoreDao primaryStoreDao; - // @Inject - // PrimaryDataStoreProviderManager primaryDataStoreProviderMgr; @Inject AgentManager agentMgr; Long dcId; @@ -109,25 +107,15 @@ public void setUp() { results.add(host); Mockito.when(hostDao.listAll()).thenReturn(results); Mockito.when(hostDao.findHypervisorHostInCluster(ArgumentMatchers.anyLong())).thenReturn(results); - // CreateObjectAnswer createVolumeFromImageAnswer = new - // CreateObjectAnswer(null,UUID.randomUUID().toString(), null); - - // Mockito.when(primaryStoreDao.findById(Mockito.anyLong())).thenReturn(primaryStore); } private PrimaryDataStoreInfo createPrimaryDataStore() { try { - // primaryDataStoreProviderMgr.configure("primary data store mgr", - // new HashMap()); - // PrimaryDataStoreProvider provider = - // primaryDataStoreProviderMgr.getDataStoreProvider("Solidfre Primary Data Store Provider"); Map params = new HashMap(); params.put("url", "nfs://test/test"); params.put("dcId", dcId.toString()); params.put("clusterId", clusterId.toString()); params.put("name", "my primary data store"); - // PrimaryDataStoreInfo primaryDataStoreInfo = - // provider.registerDataStore(params); return null; } catch (Exception e) { return null; diff --git a/plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/StorPoolDownloadVolumeCommandWrapper.java b/plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/StorPoolDownloadVolumeCommandWrapper.java index 1679e646e189..de8b9484d117 100644 --- a/plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/StorPoolDownloadVolumeCommandWrapper.java +++ b/plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/StorPoolDownloadVolumeCommandWrapper.java @@ -29,7 +29,6 @@ import org.apache.cloudstack.utils.qemu.QemuImg; import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat; import org.apache.cloudstack.utils.qemu.QemuImgFile; -//import java.io.File; import com.cloud.agent.api.storage.StorPoolDownloadVolumeCommand; import com.cloud.agent.api.to.DataStoreTO; diff --git a/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/collector/StorPoolAbandonObjectsCollector.java b/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/collector/StorPoolAbandonObjectsCollector.java index 6258767921d2..0eebf83ade0f 100644 --- a/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/collector/StorPoolAbandonObjectsCollector.java +++ b/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/collector/StorPoolAbandonObjectsCollector.java @@ -37,7 +37,6 @@ import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; -//import org.apache.cloudstack.storage.datastore.util.StorPoolHelper; import org.apache.cloudstack.storage.datastore.util.StorPoolUtil; import org.apache.commons.collections.CollectionUtils; diff --git a/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java b/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java index d93990ee0711..0b1ce0ca83ea 100644 --- a/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java +++ b/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java @@ -882,7 +882,6 @@ public void copyAsync(DataObject srcData, DataObject dstData, AsyncCompletionCal if (resp.getError() != null) { err = String.format("Could not create Storpool volume for CS template %s. Error: %s", name, resp.getError()); } else { - //updateVolume(dstData.getId()); VolumeObjectTO dstTO = (VolumeObjectTO)dstData.getTO(); dstTO.setPath(StorPoolUtil.devPath(StorPoolUtil.getNameFromResponse(resp, false))); dstTO.setSize(size); diff --git a/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/util/StorPoolHelper.java b/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/util/StorPoolHelper.java index f13d296af3b0..3572d59876be 100644 --- a/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/util/StorPoolHelper.java +++ b/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/util/StorPoolHelper.java @@ -175,32 +175,6 @@ public static Map addStorPoolTags(String name, String vmUuid, St return tags; } - // Initialize custom logger for updated volume and snapshots -// public static void appendLogger(Logger log, String filePath, String kindOfLog) { -// Appender appender = null; -// PatternLayout patternLayout = new PatternLayout(); -// patternLayout.setConversionPattern("%d{YYYY-MM-dd HH:mm:ss.SSS} %m%n"); -// SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); -// Timestamp timestamp = new Timestamp(System.currentTimeMillis()); -// String path = filePath + "-" + sdf.format(timestamp) + ".log"; -// try { -// appender = new RollingFileAppender(patternLayout, path); -// log.setAdditivity(false); -// log.addAppender(appender); -// } catch (IOException e) { -// e.printStackTrace(); -// } -// if (kindOfLog.equals("update")) { -// StorPoolUtil.spLog( -// "You can find information about volumes and snapshots, which will be updated in Database with their globalIs in %s log file", -// path); -// } else if (kindOfLog.equals("abandon")) { -// StorPoolUtil.spLog( -// "You can find information about volumes and snapshots, for which CloudStack doesn't have information in %s log file", -// path); -// } -// } - public static void setSpClusterIdIfNeeded(long hostId, String clusterId, ClusterDao clusterDao, HostDao hostDao, ClusterDetailsDao clusterDetails) { HostVO host = hostDao.findById(hostId); diff --git a/scripts/installer/createtmplt.sh b/scripts/installer/createtmplt.sh index db3cfd71ee19..5f37e25b787c 100755 --- a/scripts/installer/createtmplt.sh +++ b/scripts/installer/createtmplt.sh @@ -270,9 +270,4 @@ echo "volume.size=$volsize" >> /$tmpltfs/template.properties zfs snapshot -r $tmpltfs@vmops_ss rollback_if_needed $tmpltfs $? "Failed to snapshot filesystem" -#if [ "$cleanup" == "true" ] -#then - #rm -f $tmpltimg -#fi - exit 0 diff --git a/scripts/installer/createvolume.sh b/scripts/installer/createvolume.sh index 52792e9fc3aa..3df2586902b9 100755 --- a/scripts/installer/createvolume.sh +++ b/scripts/installer/createvolume.sh @@ -271,9 +271,4 @@ echo "volume.size=$volsize" >> /$volfs/volume.properties zfs snapshot -r $volfs@vmops_ss rollback_if_needed $volfs $? "Failed to snapshot filesystem" -#if [ "$cleanup" == "true" ] -#then - #rm -f $volimg -#fi - exit 0 diff --git a/scripts/storage/secondary/listvmtmplt.sh b/scripts/storage/secondary/listvmtmplt.sh index 8463b51e4f60..c0f2132879ba 100755 --- a/scripts/storage/secondary/listvmtmplt.sh +++ b/scripts/storage/secondary/listvmtmplt.sh @@ -53,11 +53,6 @@ for i in $(find /$rootdir -name template.properties ); do d=$(dirname $i) filename=$(grep "^filename" $i | awk -F"=" '{print $NF}') -# size=$(grep "virtualsize" $i | awk -F"=" '{print $NF}') -# if [ -n "$filename" ] && [ -n "$size" ] -# then -# d=$d/$filename/$size -# fi echo ${d#/}/$filename #remove leading slash done diff --git a/scripts/storage/secondary/listvolume.sh b/scripts/storage/secondary/listvolume.sh index d039c659094b..605b8b9a190d 100755 --- a/scripts/storage/secondary/listvolume.sh +++ b/scripts/storage/secondary/listvolume.sh @@ -53,11 +53,6 @@ for i in $(find /$rootdir -name volume.properties ); do d=$(dirname $i) filename=$(grep "^filename" $i | awk -F"=" '{print $NF}') -# size=$(grep "virtualsize" $i | awk -F"=" '{print $NF}') -# if [ -n "$filename" ] && [ -n "$size" ] -# then -# d=$d/$filename/$size -# fi echo ${d#/}/$filename #remove leading slash done diff --git a/scripts/vm/hypervisor/ovm3/cloudstack.py b/scripts/vm/hypervisor/ovm3/cloudstack.py index e82863e7af73..39b5926509da 100644 --- a/scripts/vm/hypervisor/ovm3/cloudstack.py +++ b/scripts/vm/hypervisor/ovm3/cloudstack.py @@ -67,10 +67,6 @@ def get_services(self, version=None): 'get_module_version': getModuleVersion, 'get_ovs_version': ovmVersion, 'ping': ping, -# 'patch': ovmCsPatch, -# 'ovs_agent_set_ssl': ovsAgentSetSsl, -# 'ovs_agent_set_port': ovsAgentSetPort, -# 'ovs_restart_agent': ovsRestartAgent, } def getName(self): diff --git a/scripts/vm/hypervisor/xenserver/perfmon.py b/scripts/vm/hypervisor/xenserver/perfmon.py index 59c1ac3b367c..fcdc8a62fa44 100755 --- a/scripts/vm/hypervisor/xenserver/perfmon.py +++ b/scripts/vm/hypervisor/xenserver/perfmon.py @@ -210,11 +210,6 @@ def get_vm_group_perfmon(args={}): total_counter = int(args['total_counter']) now = int(time.time()) / 60 - # Get pool's info of this host - #pool = login.xenapi.pool.get_all()[0] - # Get master node's address of pool - #master = login.xenapi.pool.get_master(pool) - #master_address = login.xenapi.host.get_address(master) session = login._session max_duration = 0 @@ -226,7 +221,6 @@ def get_vm_group_perfmon(args={}): rrd_updates = RRDUpdates() rrd_updates.refresh(login.xenapi, now * 60 - max_duration, session, {}) - #for uuid in rrd_updates.get_vm_list(): for vm_count in xrange(1, total_vm + 1): vm_name = args['vmname' + str(vm_count)] vm_uuid = getuuid(vm_name) diff --git a/scripts/vm/hypervisor/xenserver/xcposs/NFSSR.py b/scripts/vm/hypervisor/xenserver/xcposs/NFSSR.py index 306f94166167..84eb7307b85f 100644 --- a/scripts/vm/hypervisor/xenserver/xcposs/NFSSR.py +++ b/scripts/vm/hypervisor/xenserver/xcposs/NFSSR.py @@ -175,20 +175,6 @@ def create(self, sr_uuid, size): pass raise exn - #newpath = os.path.join(self.path, sr_uuid) - #if util.ioretry(lambda: util.pathexists(newpath)): - # if len(util.ioretry(lambda: util.listdir(newpath))) != 0: - # self.detach(sr_uuid) - # raise xs_errors.XenError('SRExists') - #else: - # try: - # util.ioretry(lambda: util.makedirs(newpath)) - # except util.CommandException, inst: - # if inst.code != errno.EEXIST: - # self.detach(sr_uuid) - # raise xs_errors.XenError('NFSCreate', - # opterr='remote directory creation error is %d' - # % inst.code) self.detach(sr_uuid) def delete(self, sr_uuid): diff --git a/scripts/vm/hypervisor/xenserver/xcpserver/NFSSR.py b/scripts/vm/hypervisor/xenserver/xcpserver/NFSSR.py index 62031e3708af..faaf6d96486b 100755 --- a/scripts/vm/hypervisor/xenserver/xcpserver/NFSSR.py +++ b/scripts/vm/hypervisor/xenserver/xcpserver/NFSSR.py @@ -106,7 +106,6 @@ def mount(self, mountpoint, remotepath): def attach(self, sr_uuid): self.validate_remotepath(False) - #self.remotepath = os.path.join(self.dconf['serverpath'], sr_uuid) self.remotepath = self.dconf['serverpath'] util._testHost(self.dconf['server'], NFSPORT, 'NFSTarget') self.mount_remotepath(sr_uuid) @@ -175,20 +174,6 @@ def create(self, sr_uuid, size): pass raise exn - #newpath = os.path.join(self.path, sr_uuid) - #if util.ioretry(lambda: util.pathexists(newpath)): - # if len(util.ioretry(lambda: util.listdir(newpath))) != 0: - # self.detach(sr_uuid) - # raise xs_errors.XenError('SRExists') - #else: - # try: - # util.ioretry(lambda: util.makedirs(newpath)) - # except util.CommandException, inst: - # if inst.code != errno.EEXIST: - # self.detach(sr_uuid) - # raise xs_errors.XenError('NFSCreate', - # opterr='remote directory creation error is %d' - # % inst.code) self.detach(sr_uuid) def delete(self, sr_uuid): diff --git a/scripts/vm/hypervisor/xenserver/xenserver56/NFSSR.py b/scripts/vm/hypervisor/xenserver/xenserver56/NFSSR.py index b8489e7b7663..50e9e6077ce3 100755 --- a/scripts/vm/hypervisor/xenserver/xenserver56/NFSSR.py +++ b/scripts/vm/hypervisor/xenserver/xenserver56/NFSSR.py @@ -178,20 +178,6 @@ def create(self, sr_uuid, size): pass raise exn - #newpath = os.path.join(self.path, sr_uuid) - #if util.ioretry(lambda: util.pathexists(newpath)): - # if len(util.ioretry(lambda: util.listdir(newpath))) != 0: - # self.detach(sr_uuid) - # raise xs_errors.XenError('SRExists') - #else: - # try: - # util.ioretry(lambda: util.makedirs(newpath)) - # except util.CommandException, inst: - # if inst.code != errno.EEXIST: - # self.detach(sr_uuid) - # raise xs_errors.XenError('NFSCreate', - # opterr='remote directory creation error is %d' - # % inst.code) self.detach(sr_uuid) @FileSR.locking("SRUnavailable") diff --git a/scripts/vm/hypervisor/xenserver/xenserver56fp1/NFSSR.py b/scripts/vm/hypervisor/xenserver/xenserver56fp1/NFSSR.py index b8c115745afd..9d2f81f8e8fa 100755 --- a/scripts/vm/hypervisor/xenserver/xenserver56fp1/NFSSR.py +++ b/scripts/vm/hypervisor/xenserver/xenserver56fp1/NFSSR.py @@ -107,7 +107,6 @@ def mount(self, mountpoint, remotepath): def attach(self, sr_uuid): self.validate_remotepath(False) - #self.remotepath = os.path.join(self.dconf['serverpath'], sr_uuid) self.remotepath = self.dconf['serverpath'] util._testHost(self.dconf['server'], NFSPORT, 'NFSTarget') self.mount_remotepath(sr_uuid) @@ -176,20 +175,6 @@ def create(self, sr_uuid, size): pass raise exn - #newpath = os.path.join(self.path, sr_uuid) - #if util.ioretry(lambda: util.pathexists(newpath)): - # if len(util.ioretry(lambda: util.listdir(newpath))) != 0: - # self.detach(sr_uuid) - # raise xs_errors.XenError('SRExists') - #else: - # try: - # util.ioretry(lambda: util.makedirs(newpath)) - # except util.CommandException, inst: - # if inst.code != errno.EEXIST: - # self.detach(sr_uuid) - # raise xs_errors.XenError('NFSCreate', - # opterr='remote directory creation error is %d' - # % inst.code) self.detach(sr_uuid) def delete(self, sr_uuid): diff --git a/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py b/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py index 9a3fa8bc9a16..68aaeae24724 100755 --- a/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py +++ b/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py @@ -181,20 +181,6 @@ def create(self, sr_uuid, size): pass raise exn - #newpath = os.path.join(self.path, sr_uuid) - #if util.ioretry(lambda: util.pathexists(newpath)): - # if len(util.ioretry(lambda: util.listdir(newpath))) != 0: - # self.detach(sr_uuid) - # raise xs_errors.XenError('SRExists') - #else: - # try: - # util.ioretry(lambda: util.makedirs(newpath)) - # except util.CommandException, inst: - # if inst.code != errno.EEXIST: - # self.detach(sr_uuid) - # raise xs_errors.XenError('NFSCreate', - # opterr='remote directory creation error is %d' - # % inst.code) self.detach(sr_uuid) def delete(self, sr_uuid): diff --git a/scripts/vm/network/security_group.py b/scripts/vm/network/security_group.py index d71e27eb2644..e74412020324 100755 --- a/scripts/vm/network/security_group.py +++ b/scripts/vm/network/security_group.py @@ -1382,15 +1382,6 @@ def verify_network_rules(vm_name, vm_id, vm_ip, vm_ip6, vm_mac, vif, brname, sec print("Cannot find vif") sys.exit(1) - #vm_name = "i-2-55-VM" - #vm_id = 55 - #vm_ip = "10.11.118.128" - #vm_ip6 = "fe80::1c00:b4ff:fe00:5" - #vm_mac = "1e:00:b4:00:00:05" - #vif = "vnet11" - #brname = "cloudbr0" - #sec_ips = "10.11.118.133;10.11.118.135;10.11.118.138;" # end with ";" and separated by ";" - vm_ips = [] if sec_ips is not None: vm_ips = sec_ips.split(';') diff --git a/scripts/vm/network/vnet/ovstunnel.py b/scripts/vm/network/vnet/ovstunnel.py index a39b6b18ecc8..b47455b361d7 100755 --- a/scripts/vm/network/vnet/ovstunnel.py +++ b/scripts/vm/network/vnet/ovstunnel.py @@ -49,17 +49,14 @@ def setup_ovs_bridge(bridge, key, cs_host_id): logging.debug("Bridge has been manually created:%s" % res) if res: -# result = "FAILURE:%s" % res result = 'false' else: # Verify the bridge actually exists, with the gre_key properly set res = lib.do_cmd([lib.VSCTL_PATH, "get", "bridge", bridge, "other_config:gre_key"]) if key in str(res): -# result = "SUCCESS:%s" % bridge result = 'true' else: -# result = "FAILURE:%s" % res result = 'false' lib.do_cmd([lib.VSCTL_PATH, "set", "bridge", bridge, "other_config:is-ovs-tun-network=True"]) @@ -134,10 +131,8 @@ def destroy_ovs_bridge(bridge): res = lib.do_cmd([lib.VSCTL_PATH, "del-br", bridge]) logging.debug("Bridge has been manually removed:%s" % res) if res: -# result = "FAILURE:%s" % res result = 'false' else: -# result = "SUCCESS:%s" % bridge result = 'true' logging.debug("Destroy_ovs_bridge completed with result:%s" % result) @@ -150,7 +145,6 @@ def create_tunnel(bridge, remote_ip, key, src_host, dst_host): res = lib.check_switch() if res != "SUCCESS": logging.debug("Openvswitch running: NO") -# return "FAILURE:%s" % res return 'false' # We need to keep the name below 14 characters @@ -189,7 +183,6 @@ def create_tunnel(bridge, remote_ip, key, src_host, dst_host): if len(iface_list) != 1: logging.debug("WARNING: Unexpected output while verifying " + "port %s on bridge %s" % (name, bridge)) -# return "FAILURE:VERIFY_PORT_FAILED" return 'false' # verify interface @@ -205,7 +198,6 @@ def create_tunnel(bridge, remote_ip, key, src_host, dst_host): if key not in str(key_validation) or remote_ip not in str(ip_validation): logging.debug("WARNING: Unexpected output while verifying " + "interface %s on bridge %s" % (name, bridge)) -# return "FAILURE:VERIFY_INTERFACE_FAILED" return 'false' logging.debug("Tunnel interface validated:%s" % verify_interface_ip) @@ -268,7 +260,6 @@ def destroy_tunnel(bridge, iface_name): ofport = get_field_of_interface(iface_name, "ofport") lib.del_flows(bridge, in_port=ofport) lib.del_port(bridge, iface_name) -# return "SUCCESS" return 'true' def get_field_of_interface(iface_name, field): diff --git a/server/src/main/java/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java b/server/src/main/java/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java index b5fb77c8179d..737d696abb6e 100644 --- a/server/src/main/java/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java +++ b/server/src/main/java/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java @@ -297,8 +297,6 @@ public boolean stop() { public boolean configure(String name, Map params) throws ConfigurationException { Map configs = _configDao.getConfiguration("management-server", params); String stoppedValue = configs.get("vm.resource.release.interval"); - // String destroyedValue = - // configs.get("capacity.skipcounting.destroyed.hours"); String destroyedValue = null; _secondsToSkipStoppedVMs = NumbersUtil.parseInt(stoppedValue, 86400); _secondsToSkipDestroyedVMs = NumbersUtil.parseInt(destroyedValue, 0); diff --git a/server/src/main/java/com/cloud/api/doc/ApiXmlDocWriter.java b/server/src/main/java/com/cloud/api/doc/ApiXmlDocWriter.java index 5de5cd03fe13..87d88df79e3b 100644 --- a/server/src/main/java/com/cloud/api/doc/ApiXmlDocWriter.java +++ b/server/src/main/java/com/cloud/api/doc/ApiXmlDocWriter.java @@ -77,13 +77,11 @@ private static List setAsyncResponses() { List asyncResponses = new ArrayList(); asyncResponses.add(TemplateResponse.class.getName()); asyncResponses.add(VolumeResponse.class.getName()); - //asyncResponses.add(LoadBalancerResponse.class.getName()); asyncResponses.add(HostResponse.class.getName()); asyncResponses.add(IPAddressResponse.class.getName()); asyncResponses.add(StoragePoolResponse.class.getName()); asyncResponses.add(UserVmResponse.class.getName()); asyncResponses.add(SecurityGroupResponse.class.getName()); - //asyncResponses.add(ExternalLoadBalancerResponse.class.getName()); asyncResponses.add(SnapshotResponse.class.getName()); return asyncResponses; diff --git a/server/src/main/java/com/cloud/network/ExternalNetworkDeviceManagerImpl.java b/server/src/main/java/com/cloud/network/ExternalNetworkDeviceManagerImpl.java index a983af839ca4..f756a4975cb3 100644 --- a/server/src/main/java/com/cloud/network/ExternalNetworkDeviceManagerImpl.java +++ b/server/src/main/java/com/cloud/network/ExternalNetworkDeviceManagerImpl.java @@ -139,20 +139,6 @@ public NetworkDeviceResponse getApiResponse(Host device) { } private List listNetworkDevice(Long zoneId, Long physicalNetworkId, Long podId, Host.Type type) { -// List res = new ArrayList(); -// if (podId != null) { -// List devs = _hostDao.listBy(type, null, podId, zoneId); -// if (devs.size() == 1) { -// res.add(devs.get(0)); -// } else { -// logger.debug("List " + type + ": " + devs.size() + " found"); -// } -// } else { -// List devs = _hostDao.listBy(type, zoneId); -// res.addAll(devs); - // } - - // return res; return null; } diff --git a/server/src/main/java/com/cloud/network/rules/PrivateGatewayRules.java b/server/src/main/java/com/cloud/network/rules/PrivateGatewayRules.java index 1b827b384d0f..8e70e4ec3a86 100644 --- a/server/src/main/java/com/cloud/network/rules/PrivateGatewayRules.java +++ b/server/src/main/java/com/cloud/network/rules/PrivateGatewayRules.java @@ -69,7 +69,6 @@ public boolean accept(final NetworkTopologyVisitor visitor, final VirtualRouter // setup source nat if (_nicProfile != null) { _isAddOperation = true; - // result = setupVpcPrivateNetwork(router, true, guestNic); result = visitor.visit(this); } } catch (final Exception ex) { diff --git a/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java b/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java index db79cad9d655..b07f2f63dde8 100644 --- a/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java +++ b/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java @@ -564,9 +564,7 @@ private boolean enableStaticNat(long ipId, long vmId, long networkId, boolean is _accountMgr.checkAccess(vmOwner, SecurityChecker.AccessType.UseEntry, false, network); //is static nat is for vm secondary ip - //dstIp = guestNic.getIp4Address(); if (vmGuestIp != null) { - //dstIp = guestNic.getIp4Address(); if (!dstIp.equals(vmGuestIp)) { //check whether the secondary ip set to the vm or not diff --git a/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java index dc408602c934..e7605e856035 100644 --- a/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java +++ b/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java @@ -212,7 +212,6 @@ protected void runInContext() { try { cleanupFinishedWork(); cleanupUnfinishedWork(); - //processScheduledWork(); } catch (Throwable th) { logger.error("Problem with SG Cleanup", th); } diff --git a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java index fce848aa30d3..6ca01918de67 100644 --- a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java @@ -328,8 +328,6 @@ public void doInTransactionWithoutResult(TransactionStatus status) { // setup XenServer default PV driver version initiateXenServerPVDriverVersion(); - // We should not update seed data UUID column here since this will be invoked in upgrade case as well. - //updateUuids(); // Set init to true _configDao.update("init", "Hidden", "true"); diff --git a/server/src/main/java/com/cloud/test/IPRangeConfig.java b/server/src/main/java/com/cloud/test/IPRangeConfig.java index 22ebb56963a1..e041f7390532 100644 --- a/server/src/main/java/com/cloud/test/IPRangeConfig.java +++ b/server/src/main/java/com/cloud/test/IPRangeConfig.java @@ -77,7 +77,6 @@ public void run(String[] args) { } String pod = args[2]; String zone = args[3]; - ; String startIP = args[4]; String endIP = null; if (args.length == 6) { @@ -99,31 +98,6 @@ public void run(String[] args) { } } - public List changePublicIPRangeGUI(String op, String zone, String startIP, String endIP, long physicalNetworkId) { - String result = checkErrors("public", op, null, zone, startIP, endIP); - if (!result.equals("success")) { - return DatabaseConfig.genReturnList("false", result); - } - - long zoneId = PodZoneConfig.getZoneId(zone); - result = changeRange(op, "public", -1, zoneId, startIP, endIP, null, physicalNetworkId); - - return DatabaseConfig.genReturnList("true", result); - } - - public List changePrivateIPRangeGUI(String op, String pod, String zone, String startIP, String endIP) { - String result = checkErrors("private", op, pod, zone, startIP, endIP); - if (!result.equals("success")) { - return DatabaseConfig.genReturnList("false", result); - } - - long podId = PodZoneConfig.getPodId(pod, zone); - long zoneId = PodZoneConfig.getZoneId(zone); - result = changeRange(op, "private", podId, zoneId, startIP, endIP, null, -1); - - return DatabaseConfig.genReturnList("true", result); - } - private String checkErrors(String type, String op, String pod, String zone, String startIP, String endIP) { if (!op.equals("add") && !op.equals("delete")) { return usage(); @@ -153,15 +127,7 @@ private String checkErrors(String type, String op, String pod, String zone, Stri } // Check that the IPs that are being added are compatible with either the zone's public netmask, or the pod's CIDR - if (type.equals("public")) { - // String publicNetmask = getPublicNetmask(zone); - // String publicGateway = getPublicGateway(zone); - - // if (publicNetmask == null) return "Please ensure that your zone's public net mask is specified"; - // if (!sameSubnet(startIP, endIP, publicNetmask)) return "Please ensure that your start IP and end IP are in the same subnet, as per the zone's netmask."; - // if (!sameSubnet(startIP, publicGateway, publicNetmask)) return "Please ensure that your start IP is in the same subnet as your zone's gateway, as per the zone's netmask."; - // if (!sameSubnet(endIP, publicGateway, publicNetmask)) return "Please ensure that your end IP is in the same subnet as your zone's gateway, as per the zone's netmask."; - } else if (type.equals("private")) { + if (type.equals("private")) { String cidrAddress = getCidrAddress(pod, zone); long cidrSize = getCidrSize(pod, zone); diff --git a/server/src/main/java/com/cloud/test/PodZoneConfig.java b/server/src/main/java/com/cloud/test/PodZoneConfig.java index 7cd6cb118710..2d32621a2522 100644 --- a/server/src/main/java/com/cloud/test/PodZoneConfig.java +++ b/server/src/main/java/com/cloud/test/PodZoneConfig.java @@ -75,11 +75,6 @@ public void checkAllPodCidrSubnets() { } private String checkPodCidrSubnets(long dcId, HashMap> currentPodCidrSubnets) { - -// DataCenterDao _dcDao = null; -// final ComponentLocator locator = ComponentLocator.getLocator("management-server"); - -// _dcDao = locator.getDao(DataCenterDao.class); // For each pod, return an error if any of the following is true: // 1. The pod's CIDR subnet conflicts with the guest network subnet // 2. The pod's CIDR subnet conflicts with the CIDR subnet of any other pod @@ -87,7 +82,6 @@ private String checkPodCidrSubnets(long dcId, HashMap> curr String zoneName = PodZoneConfig.getZoneName(dcId); //get the guest network cidr and guest netmask from the zone -// DataCenterVO dcVo = _dcDao.findById(dcId); String guestNetworkCidr = IPRangeConfig.getGuestNetworkCidr(dcId); diff --git a/server/src/main/java/org/apache/cloudstack/storage/NfsMountManagerImpl.java b/server/src/main/java/org/apache/cloudstack/storage/NfsMountManagerImpl.java index 0d59a6e3a856..f06adac54ef4 100644 --- a/server/src/main/java/org/apache/cloudstack/storage/NfsMountManagerImpl.java +++ b/server/src/main/java/org/apache/cloudstack/storage/NfsMountManagerImpl.java @@ -97,7 +97,6 @@ private String mount(String path, String parent, String nfsVersion) { if (nfsVersion != null){ command.add("-o", "vers=" + nfsVersion); } - // command.add("-o", "soft,timeo=133,retrans=2147483647,tcp,acdirmax=0,acdirmin=0"); if ("Mac OS X".equalsIgnoreCase(System.getProperty("os.name"))) { command.add("-o", "resvport"); } diff --git a/server/src/test/java/com/cloud/api/APITest.java b/server/src/test/java/com/cloud/api/APITest.java index e76b7a74905a..dbe91200027e 100644 --- a/server/src/test/java/com/cloud/api/APITest.java +++ b/server/src/test/java/com/cloud/api/APITest.java @@ -187,7 +187,6 @@ protected Object fromSerializedString(String result, Class repCls) { * @return login response string */ protected void login(String username, String password) { - //String md5Psw = createMD5String(password); // send login request HashMap params = new HashMap(); params.put("response", "json"); diff --git a/server/src/test/java/com/cloud/vpc/Site2SiteVpnTest.java b/server/src/test/java/com/cloud/vpc/Site2SiteVpnTest.java deleted file mode 100644 index f8a42df6c606..000000000000 --- a/server/src/test/java/com/cloud/vpc/Site2SiteVpnTest.java +++ /dev/null @@ -1,75 +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 com.cloud.vpc; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = "classpath:/VpcTestContext.xml") -public class Site2SiteVpnTest { - -// private static void addDaos(MockComponentLocator locator) { -// locator.addDao("AccountDao", AccountDaoImpl.class); -// locator.addDao("Site2SiteCustomerGatewayDao", Site2SiteCustomerGatewayDaoImpl.class); -// locator.addDao("Site2SiteVpnGatewayDao", Site2SiteVpnGatewayDaoImpl.class); -// locator.addDao("Site2SiteVpnConnectionDao", Site2SiteVpnConnectionDaoImpl.class); -// -// locator.addDao("IPAddressDao", IPAddressDaoImpl.class); -// locator.addDao("VpcDao", VpcDaoImpl.class); -// locator.addDao("ConfiguratioDao", MockConfigurationDaoImpl.class); -// -// } -// -// private static void addManagers(MockComponentLocator locator) { -// locator.addManager("AccountManager", MockAccountManagerImpl.class); -// locator.addManager("VpcManager", MockVpcManagerImpl.class); -// } - - @Before - public void setUp() { -// locator = new MockComponentLocator("management-server"); -// addDaos(locator); -// addManagers(locator); -// logger.info("Finished setUp"); - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testInjected() throws Exception { -// List>> list = -// new ArrayList>>(); -// list.add(new Pair>("Site2SiteVpnServiceProvider", MockSite2SiteVpnServiceProvider.class)); -// locator.addAdapterChain(Site2SiteVpnServiceProvider.class, list); -// logger.info("Finished add adapter"); -// locator.makeActive(new DefaultInterceptorLibrary()); -// logger.info("Finished make active"); -// Site2SiteVpnManagerImpl vpnMgr = ComponentLocator.inject(Site2SiteVpnManagerImpl.class); -// logger.info("Finished inject"); -// Assert.assertTrue(vpnMgr.configure("Site2SiteVpnMgr",new HashMap()) ); -// Assert.assertTrue(vpnMgr.start()); - - } - -} diff --git a/server/src/test/java/com/cloud/vpc/VpcTestConfiguration.java b/server/src/test/java/com/cloud/vpc/VpcTestConfiguration.java index 22c0b47e1541..0d45d50d8ae3 100644 --- a/server/src/test/java/com/cloud/vpc/VpcTestConfiguration.java +++ b/server/src/test/java/com/cloud/vpc/VpcTestConfiguration.java @@ -176,11 +176,6 @@ public RemoteAccessVpnService remoteAccessVpnService() { return Mockito.mock(RemoteAccessVpnService.class); } -// @Bean -// public VpcDao vpcDao() { -// return Mockito.mock(VpcDao.class); -// } - @Bean public NetworkDao networkDao() { return Mockito.mock(NetworkDao.class); diff --git a/server/src/test/java/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java b/server/src/test/java/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java index eab5d3eeffd8..2fa9a2d7a44b 100644 --- a/server/src/test/java/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java +++ b/server/src/test/java/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java @@ -225,7 +225,6 @@ public void createVpcNtwkOff() { NetworkOfferingVO off = configMgr.createNetworkOffering("isolated", "isolated", TrafficType.Guest, null, true, Availability.Optional, 200, serviceProviderMap, false, Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true, true, false, false, false,null, null, null, false, null, null, false); - // System.out.println("Creating Vpc Network Offering"); assertNotNull("Vpc Isolated network offering with Vpc provider ", off); } @@ -245,7 +244,6 @@ public void createVpcNtwkOffWithNetscaler() { NetworkOfferingVO off = configMgr.createNetworkOffering("isolated", "isolated", TrafficType.Guest, null, true, Availability.Optional, 200, serviceProviderMap, false, Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true, true, false, false, false,null, null, null, false, null, null, false); - // System.out.println("Creating Vpc Network Offering"); assertNotNull("Vpc Isolated network offering with Vpc and Netscaler provider ", off); } } diff --git a/services/console-proxy/rdpconsole/src/main/java/common/adapter/AwtCanvasAdapter.java b/services/console-proxy/rdpconsole/src/main/java/common/adapter/AwtCanvasAdapter.java index f3a73d70dbdd..b60dccfc03e7 100644 --- a/services/console-proxy/rdpconsole/src/main/java/common/adapter/AwtCanvasAdapter.java +++ b/services/console-proxy/rdpconsole/src/main/java/common/adapter/AwtCanvasAdapter.java @@ -70,7 +70,6 @@ public void handleData(ByteBuffer buf, Link link) { default: throw new RuntimeException("Order is not implemented: " + buf + "."); - // break; } buf.unref(); @@ -93,8 +92,6 @@ private void handleBitmap(BitmapOrder order, ByteBuffer buf) { Graphics2D g = (Graphics2D)image.getGraphics(); for (BitmapRectangle rectangle : order.rectangles) { - // *DEBUG*/System.out.println("["+this+"] DEBUG: Rectangle: " + - // rectangle.toString()); int x = rectangle.x; int y = rectangle.y; @@ -148,9 +145,6 @@ private void handleBitmap(BitmapOrder order, ByteBuffer buf) { * Example. */ public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - // System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); ByteBuffer packet = new ByteBuffer(new byte[] {0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00, 0x10, 0x00, 0x01, 0x04, 0x0a, 0x00, 0x0c, (byte)0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}); diff --git a/services/console-proxy/rdpconsole/src/main/java/rdpclient/RdpClient.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/RdpClient.java index 3dd7cf921271..767ca36cb181 100644 --- a/services/console-proxy/rdpconsole/src/main/java/rdpclient/RdpClient.java +++ b/services/console-proxy/rdpconsole/src/main/java/rdpclient/RdpClient.java @@ -96,15 +96,6 @@ public RdpClient(String id, String serverHostName, String domain, String userNam assembleRDPPipeline(serverHostName, domain, userName, password, pcb, screen, canvas, sslState); } - // /* DEBUG */ -// @Override -// protected HashMap initElementMap(String id) { -// HashMap map = new HashMap(); -// map.put("IN", new ServerPacketSniffer("server <")); -// map.put("OUT", new ClientPacketSniffer("> client")); -// return map; -// } - /** * Assemble connection sequence and main pipeline. * diff --git a/services/console-proxy/rdpconsole/src/main/java/rdpclient/clip/ClipboardDataFormat.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/clip/ClipboardDataFormat.java index 3a1653609332..29afc523ad75 100644 --- a/services/console-proxy/rdpconsole/src/main/java/rdpclient/clip/ClipboardDataFormat.java +++ b/services/console-proxy/rdpconsole/src/main/java/rdpclient/clip/ClipboardDataFormat.java @@ -40,11 +40,6 @@ public class ClipboardDataFormat { // Names HTML_FORMAT, - - // RTF_AS_TEXT, - // RICH_TEXT_FORMAT_WITHOUT_OBJECTS, - // RICH_TEXT_FORMAT, - }; public final int id; @@ -115,15 +110,6 @@ public String parseServerResponseAsString(ByteBuffer buf) { if (HTML_FORMAT.equals(name)) return buf.readVariableString(RdpConstants.CHARSET_8); // TODO: verify - // if (RTF_AS_TEXT.equals(name)) - // return buf.readVariableString(RdpConstants.CHARSET_8); // TODO: verify - // - // if (RICH_TEXT_FORMAT_WITHOUT_OBJECTS.equals(name)) - // return buf.readVariableString(RdpConstants.CHARSET_8); // TODO: verify - // - // if (RICH_TEXT_FORMAT.equals(name)) - // return buf.readVariableString(RdpConstants.CHARSET_8); // TODO: verify - return null; } diff --git a/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSRequest.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSRequest.java index c5ba5d62ba9d..11aee538fb04 100644 --- a/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSRequest.java +++ b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSRequest.java @@ -180,14 +180,8 @@ public static void main(String[] args) { TSRequest request = new TSRequest("TSRequest"); // Read request from buffer - // System.out.println("Request BER tree before parsing: " + request); ByteBuffer toReadBuf = new ByteBuffer(packet); request.readTag(toReadBuf); - // System.out.println("Request BER tree after parsing: " + request); - - // System.out.println("version value: " + request.version.value); - // System.out.println("negoToken value: " + ((NegoItem) - // request.negoTokens.tags[0]).negoToken.value); // Write request to buffer and compare with original ByteBuffer toWriteBuf = new ByteBuffer(packet.length + 100, true); diff --git a/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientConfirmActivePDU.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientConfirmActivePDU.java index b77f201dd772..bee26a635adf 100644 --- a/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientConfirmActivePDU.java +++ b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientConfirmActivePDU.java @@ -27,7 +27,7 @@ import common.ScreenDescription; /** - * @see http://msdn.microsoft.com/en-us/library/cc240488.aspx + * @see microsoft msdn explanation */ public class ClientConfirmActivePDU extends BaseElement { diff --git a/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSAttachUserRequest.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSAttachUserRequest.java index 47a07da73e0c..df5754738479 100644 --- a/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSAttachUserRequest.java +++ b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSAttachUserRequest.java @@ -60,9 +60,7 @@ protected void onStart() { * Example. */ 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[] packet = new byte[] { diff --git a/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs.java index 8213b74a14fc..92c7291c21aa 100644 --- a/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs.java +++ b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs.java @@ -57,7 +57,6 @@ protected void handleOneTimeData(ByteBuffer buf, Link link) { // 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 + "."); @@ -74,11 +73,9 @@ protected void handleOneTimeData(ByteBuffer buf, Link link) { // Channel Join Request PDU the connection SHOULD be dropped. // Initiator: 1007 (6+1001) - // int initiator=buf.readUnsignedShort(); buf.skipBytes(2); // Requested channel - // int requestedChannel=buf.readUnsignedShort(); buf.skipBytes(2); // Actual channel @@ -123,9 +120,7 @@ private void sendChannelRequest(int channel) { * @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[] { diff --git a/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientSynchronizePDU.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientSynchronizePDU.java index b7b52f0ab5fe..5390fbf4a768 100644 --- a/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientSynchronizePDU.java +++ b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientSynchronizePDU.java @@ -105,9 +105,7 @@ protected void onStart() { * @see http://msdn.microsoft.com/en-us/library/cc240841.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[] packet = new byte[] { diff --git a/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerBitmapUpdate.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerBitmapUpdate.java index 6accc162f0b5..39553c97e3c4 100644 --- a/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerBitmapUpdate.java +++ b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerBitmapUpdate.java @@ -142,7 +142,6 @@ public BitmapRectangle readRectangle(ByteBuffer buf) { // flag is not. // Note: Even when compression header is enabled, server sends nothing. - // rectangle.compressedBitmapHeader = buf.readBytes(8); } // (variable): A variable-length array of bytes describing a bitmap image. diff --git a/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerDemandActivePDU.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerDemandActivePDU.java index d11a26b72964..9b95b0ccf330 100644 --- a/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerDemandActivePDU.java +++ b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerDemandActivePDU.java @@ -28,8 +28,8 @@ import common.ScreenDescription; /** - * @see http://msdn.microsoft.com/en-us/library/cc240669.aspx - * @see http://msdn.microsoft.com/en-us/library/cc240484.aspx + * @see msdn cc240669 + * @see msdn cc240484 */ public class ServerDemandActivePDU extends BaseElement { @@ -83,7 +83,6 @@ public void handleData(ByteBuffer buf, Link link) { // (variable): A variable-length array of bytes containing a source // descriptor, - // ByteBuffer sourceDescriptor = buf.readBytes(lengthSourceDescriptor); buf.skipBytes(lengthSourceDescriptor); // (variable): An array of Capability Set (section 2.2.1.13.1.1.1) @@ -216,7 +215,7 @@ public void handleData(ByteBuffer buf, Link link) { public static final int CAPSSETTYPE_FRAME_ACKNOWLEDGE = 0x001E; /** - * @see http://msdn.microsoft.com/en-us/library/cc240486.aspx + * @see msdn cc240486 */ protected void handleCapabiltySets(ByteBuffer buf) { // (2 bytes): A 16-bit, unsigned integer. The number of capability sets @@ -312,7 +311,7 @@ protected void handleCapabiltySets(ByteBuffer buf) { } /** - * @see http://msdn.microsoft.com/en-us/library/cc240554.aspx + * @see msdn cc240554 */ protected void handleBitmapCapabilities(ByteBuffer buf) { @@ -388,9 +387,7 @@ protected void sendHandshakePackets() { * */ 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[] packet = new byte[] { diff --git a/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerIOChannelRouter.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerIOChannelRouter.java index 59613bb2b193..20d5f00a0489 100644 --- a/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerIOChannelRouter.java +++ b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerIOChannelRouter.java @@ -73,7 +73,6 @@ public void handleData(ByteBuffer buf, Link link) { { // It is ServerErrorAlert-ValidClient // Ignore it - //throw new RuntimeException("[" + this + "] ERROR: Incorrect PDU length: " + length + ", data: " + buf + "."); } int type = buf.readUnsignedShortLE() & 0xf; @@ -88,14 +87,12 @@ public void handleData(ByteBuffer buf, Link link) { case PDUTYPE_CONFIRMACTIVEPDU: throw new RuntimeException("Unexpected client CONFIRM ACTIVE PDU. Data: " + buf + "."); case PDUTYPE_DEACTIVATEALLPDU: - // pushDataToPad("deactivate_all", buf); /* ignore */buf.unref(); break; case PDUTYPE_DATAPDU: handleDataPdu(buf); break; case PDUTYPE_SERVER_REDIR_PKT: - // pushDataToPad("server_redir", buf); /* ignore */buf.unref(); break; default: @@ -253,7 +250,6 @@ protected void handleDataPdu(ByteBuffer buf) { long shareId = buf.readUnsignedIntLE(); if (shareId != state.serverShareId) throw new RuntimeException("Unexpected share ID: " + shareId + "."); -// buf.skipBytes(4); // Padding. buf.skipBytes(1); @@ -461,9 +457,7 @@ protected void handleDataPdu(ByteBuffer buf) { * */ public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); byte[] packet = new byte[] { // TPKT diff --git a/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSPDU.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSPDU.java index d28d0a09f701..71afe4506b37 100644 --- a/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSPDU.java +++ b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSPDU.java @@ -42,7 +42,6 @@ public void handleData(ByteBuffer buf, Link link) { switch (type) { // Expected type: send data indication: 26 (0x1a, top 6 bits, or 0x68) case 0x1a: { - // int userId = buf.readUnsignedShort() + 1001; // User ID: 1002 (1001+1) buf.skipBytes(2); // Ignore user ID int channelId = buf.readUnsignedShort(); // Channel ID: 1003 @@ -78,9 +77,6 @@ public void handleData(ByteBuffer buf, Link link) { * */ public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - // System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); byte[] packet = new byte[] { // TPKT diff --git a/services/console-proxy/rdpconsole/src/main/java/streamer/BaseElement.java b/services/console-proxy/rdpconsole/src/main/java/streamer/BaseElement.java index 15e1a8710335..5f97da21d1fe 100644 --- a/services/console-proxy/rdpconsole/src/main/java/streamer/BaseElement.java +++ b/services/console-proxy/rdpconsole/src/main/java/streamer/BaseElement.java @@ -187,7 +187,6 @@ protected final void pushDataToAllOuts(ByteBuffer buf) { if (buf == null) throw new NullPointerException(); - //return; if (outputPads.size() == 0) throw new RuntimeException("Number of outgoing connection is zero. Cannot send data to output. Data: " + buf + "."); diff --git a/services/console-proxy/rdpconsole/src/main/java/streamer/PipelineImpl.java b/services/console-proxy/rdpconsole/src/main/java/streamer/PipelineImpl.java index 84ed51440d0d..df2652e5c9ae 100644 --- a/services/console-proxy/rdpconsole/src/main/java/streamer/PipelineImpl.java +++ b/services/console-proxy/rdpconsole/src/main/java/streamer/PipelineImpl.java @@ -307,9 +307,6 @@ public String toString() { * Example. */ public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - // System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); Pipeline pipeline = new PipelineImpl("main"); diff --git a/services/console-proxy/rdpconsole/src/main/java/streamer/Queue.java b/services/console-proxy/rdpconsole/src/main/java/streamer/Queue.java index ea64b323d2cb..be4ed29e71cf 100644 --- a/services/console-proxy/rdpconsole/src/main/java/streamer/Queue.java +++ b/services/console-proxy/rdpconsole/src/main/java/streamer/Queue.java @@ -101,7 +101,6 @@ public String toString() { * Example. */ public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); System.setProperty("streamer.Element.debug", "true"); Element source1 = new FakeSource("source1") { diff --git a/services/console-proxy/rdpconsole/src/main/java/streamer/debug/MockSource.java b/services/console-proxy/rdpconsole/src/main/java/streamer/debug/MockSource.java index a77f1d4a84b2..31ef81600663 100644 --- a/services/console-proxy/rdpconsole/src/main/java/streamer/debug/MockSource.java +++ b/services/console-proxy/rdpconsole/src/main/java/streamer/debug/MockSource.java @@ -75,7 +75,6 @@ public static void main(String args[]) { new ByteBuffer(new byte[] {3, 1, 2, 3}), new ByteBuffer(new byte[] {4, 1, 2}), new ByteBuffer(new byte[] {5, 1})}; verbose = true; delay = 100; - // this.numBuffers = this.bufs.length; } }; diff --git a/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/Vnc33Authentication.java b/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/Vnc33Authentication.java index 4aa834dfcca1..8d0f9173a5b4 100644 --- a/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/Vnc33Authentication.java +++ b/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/Vnc33Authentication.java @@ -256,9 +256,7 @@ public String toString() { * Example. */ public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); final String password = "test"; diff --git a/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/Vnc33Hello.java b/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/Vnc33Hello.java index 812c6a836445..d677abaffd57 100644 --- a/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/Vnc33Hello.java +++ b/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/Vnc33Hello.java @@ -82,9 +82,7 @@ public String toString() { * Example. */ public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); InputStream is = new ByteArrayInputStream("RFB 003.007\ntest".getBytes(RfbConstants.US_ASCII_CHARSET)); ByteArrayOutputStream initOS = new ByteArrayOutputStream(); diff --git a/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/VncInitializer.java b/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/VncInitializer.java index 0b96c7303e4b..4f4d96d07d0e 100644 --- a/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/VncInitializer.java +++ b/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/VncInitializer.java @@ -158,9 +158,7 @@ public String toString() { * Example. */ public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); final String desktopName = "test"; diff --git a/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/VncMessageHandler.java b/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/VncMessageHandler.java index 5914cb30f7ad..e9b8933830fb 100644 --- a/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/VncMessageHandler.java +++ b/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/VncMessageHandler.java @@ -330,9 +330,7 @@ public String toString() { */ public static void main(String[] args) { - // System.setProperty("streamer.Link.debug", "true"); System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); Element source = new MockSource("source") { { diff --git a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxy.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxy.java index cf59129459dc..ff11bd2c3622 100644 --- a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxy.java +++ b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxy.java @@ -113,7 +113,6 @@ private static void configLog4j() { } catch (URISyntaxException e) { System.out.println("Unable to convert log4j configuration Url to URI"); } - // DOMConfigurator.configure(configUrl); } else { System.out.println("Configure log4j with default properties"); } diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java index 609cda693f8e..5adf01bedb01 100644 --- a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java +++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java @@ -2222,8 +2222,6 @@ Map s3ListTemplate(S3TO s3) { Map tmpltInfos = new HashMap(); for (S3ObjectSummary objectSummary : objectSummaries) { String key = objectSummary.getKey(); - // String installPath = StringUtils.substringBeforeLast(key, - // S3Utils.SEPARATOR); String uniqueName = determineS3TemplateNameFromKey(key); // TODO: isPublic value, where to get? TemplateProp tInfo = new TemplateProp(uniqueName, key, objectSummary.getSize(), objectSummary.getSize(), true, false); @@ -2243,8 +2241,6 @@ Map s3ListVolume(S3TO s3) { Map tmpltInfos = new HashMap(); for (S3ObjectSummary objectSummary : objectSummaries) { String key = objectSummary.getKey(); - // String installPath = StringUtils.substringBeforeLast(key, - // S3Utils.SEPARATOR); Long id = determineS3VolumeIdFromKey(key); // TODO: how to get volume template name TemplateProp tInfo = new TemplateProp(id.toString(), key, objectSummary.getSize(), objectSummary.getSize(), true, false); diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java index 64bac9e43e25..b0c053239372 100644 --- a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java +++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java @@ -1057,7 +1057,6 @@ public Map gatherTemplateInfo(String rootDir) { try { if (!loc.load()) { logger.warn("Post download installation was not completed for " + path); - // loc.purge(); _storage.cleanup(path, templateDir); continue; } @@ -1103,7 +1102,6 @@ public Map gatherVolumeInfo(String rootDir) { try { if (!loc.load()) { logger.warn("Post download installation was not completed for " + path); - // loc.purge(); _storage.cleanup(path, volumeDir); continue; } diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/UploadManagerImpl.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/UploadManagerImpl.java index ae02d7e8aa72..abddc3aa1bf3 100644 --- a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/UploadManagerImpl.java +++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/UploadManagerImpl.java @@ -415,7 +415,6 @@ public boolean configure(String name, Map params) throws Configu if (inSystemVM != null && "true".equalsIgnoreCase(inSystemVM)) { logger.info("UploadManager: starting additional services since we are inside system vm"); startAdditionalServices(); - //blockOutgoingOnPrivate(); } value = (String)params.get("install.numthreads"); diff --git a/services/secondary-storage/server/src/test/java/org/apache/cloudstack/storage/resource/LocalNfsSecondaryStorageResourceTest.java b/services/secondary-storage/server/src/test/java/org/apache/cloudstack/storage/resource/LocalNfsSecondaryStorageResourceTest.java index 3d62bc127af8..e79d013afd8c 100644 --- a/services/secondary-storage/server/src/test/java/org/apache/cloudstack/storage/resource/LocalNfsSecondaryStorageResourceTest.java +++ b/services/secondary-storage/server/src/test/java/org/apache/cloudstack/storage/resource/LocalNfsSecondaryStorageResourceTest.java @@ -71,7 +71,6 @@ public void setUp() throws ConfigurationException { } System.setProperty("paths.script", "/Users/edison/develop/asf-master/script"); - //resource.configure("test", new HashMap()); } @Test diff --git a/systemvm/agent/scripts/run-proxy.sh b/systemvm/agent/scripts/run-proxy.sh index f26f54b12b53..40e7c8f64479 100644 --- a/systemvm/agent/scripts/run-proxy.sh +++ b/systemvm/agent/scripts/run-proxy.sh @@ -33,16 +33,4 @@ do CP=${CP}:$file done -#CMDLINE=$(cat /proc/cmdline) -#for i in $CMDLINE -# do -# KEY=$(echo $i | cut -d= -f1) -# VALUE=$(echo $i | cut -d= -f2) -# case $KEY in -# mgmt_host) -# MGMT_HOST=$VALUE -# ;; -# esac -# done - java -mx700m -cp $CP:./conf com.cloud.consoleproxy.ConsoleProxy $@ diff --git a/utils/src/main/java/com/cloud/utils/xmlobject/XmlObject.java b/utils/src/main/java/com/cloud/utils/xmlobject/XmlObject.java index 67634e46c400..42f687ca74c2 100644 --- a/utils/src/main/java/com/cloud/utils/xmlobject/XmlObject.java +++ b/utils/src/main/java/com/cloud/utils/xmlobject/XmlObject.java @@ -55,14 +55,11 @@ public XmlObject putElement(String key, Object e) { } Object old = elements.get(key); if (old == null) { - //System.out.println(String.format("no %s, add new", key)); elements.put(key, e); } else { if (old instanceof List) { - //System.out.println(String.format("already list %s, add", key)); ((List)old).add(e); } else { - //System.out.println(String.format("not list list %s, add list", key)); List lst = new ArrayList(); lst.add(old); lst.add(e); diff --git a/utils/src/main/java/com/cloud/utils/xmlobject/XmlObjectParser.java b/utils/src/main/java/com/cloud/utils/xmlobject/XmlObjectParser.java index ea631704820e..25146f72b9a6 100644 --- a/utils/src/main/java/com/cloud/utils/xmlobject/XmlObjectParser.java +++ b/utils/src/main/java/com/cloud/utils/xmlobject/XmlObjectParser.java @@ -49,7 +49,6 @@ private class XmlHandler extends DefaultHandler { @Override public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException { - //System.out.println(String.format("startElement: namespaceURI:%s, localName:%s, qName:%s", namespaceURI, localName, qName)); currentValue = null; XmlObject obj = new XmlObject(); for (int i = 0; i < atts.getLength(); i++) { @@ -73,8 +72,6 @@ public void endElement(String namespaceURI, String localName, String qName) thro if (stack.isEmpty()) { root = currObj; } - - //System.out.println(String.format("endElement: namespaceURI:%s, localName:%s, qName:%s", namespaceURI, localName, qName)); } @Override @@ -82,7 +79,6 @@ public void characters(char[] ch, int start, int length) throws SAXException { StringBuilder str = new StringBuilder(); str.append(ch, start, length); currentValue = str.toString(); - //System.out.println(String.format("characters: %s", str.toString())); } XmlObject getRoot() { diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java index 5b9e3520da1b..d896d01eb43f 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java @@ -1716,7 +1716,6 @@ public void attachIso(String isoDatastorePath, ManagedObjectReference morDs, cdRom.setBacking(backingInfo); VirtualMachineConfigSpec reConfigSpec = new VirtualMachineConfigSpec(); - //VirtualDeviceConfigSpec[] deviceConfigSpecArray = new VirtualDeviceConfigSpec[1]; VirtualDeviceConfigSpec deviceConfigSpec = new VirtualDeviceConfigSpec(); deviceConfigSpec.setDevice(cdRom); @@ -1726,7 +1725,6 @@ public void attachIso(String isoDatastorePath, ManagedObjectReference morDs, deviceConfigSpec.setOperation(VirtualDeviceConfigSpecOperation.EDIT); } - //deviceConfigSpecArray[0] = deviceConfigSpec; reConfigSpec.getDeviceChange().add(deviceConfigSpec); ManagedObjectReference morTask = _context.getService().reconfigVMTask(_mor, reConfigSpec); @@ -1768,13 +1766,11 @@ public int detachIso(String isoDatastorePath, final boolean force) throws Except device.setBacking(backingInfo); VirtualMachineConfigSpec reConfigSpec = new VirtualMachineConfigSpec(); - //VirtualDeviceConfigSpec[] deviceConfigSpecArray = new VirtualDeviceConfigSpec[1]; VirtualDeviceConfigSpec deviceConfigSpec = new VirtualDeviceConfigSpec(); deviceConfigSpec.setDevice(device); deviceConfigSpec.setOperation(VirtualDeviceConfigSpecOperation.EDIT); - //deviceConfigSpecArray[0] = deviceConfigSpec; reConfigSpec.getDeviceChange().add(deviceConfigSpec); ManagedObjectReference morTask = _context.getService().reconfigVMTask(_mor, reConfigSpec);