CLOUDSTACK-9408 for the move away from download.cloud.com

 - commented some occurences of cloud.com as being harmless
  * examples
  * identifiers (internal)
 - changed the URL for vhd-util download
 - changed comments from 'cloud.com' to 'Apache CloudStack'

Author: DaanHoogland

api/src/com/cloud/offering/ServiceOffering.java

@@ -31,6 +31,7 @@ public interface ServiceOffering extends DiskOffering, InfrastructureEntity, Int
     public static final String routerDefaultOffUniqueName = "Cloud.Com-SoftwareRouter";
     public static final String elbVmDefaultOffUniqueName = "Cloud.Com-ElasticLBVm";
     public static final String internalLbVmDefaultOffUniqueName = "Cloud.Com-InternalLBVm";
+    // leaving cloud.com references as these are identifyers and no real world adresses (check against DB)
 
     public enum StorageType {
         local, shared

api/src/com/cloud/resource/ResourceService.java

@@ -53,7 +53,7 @@ public interface ResourceService {
     Host reconnectHost(ReconnectHostCmd cmd);
 
     /**
-     * We will automatically create a cloud.com cluster to attach to the external cluster and return a hyper host to perform
+     * We will automatically create an Apache CloudStack cluster to attach to the external cluster and return a hyper host to perform
      * host related operation within the cluster
      *
      * @param cmd

api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java

@@ -75,6 +75,7 @@ public class AutoScaleVmProfileResponse extends BaseResponse implements Controll
     @Parameter(name = ApiConstants.CS_URL,
                type = CommandType.STRING,
                description = "the API URL including port of the CloudStack Management Server example: http://server.cloud.com:8080/client/api?")
+    // leaving cloud.com reference above as it serves only as an example
     private String csUrl;
 
     @SerializedName(ApiConstants.ACCOUNT)

packaging/centos63/cloud.spec

@@ -445,7 +445,7 @@ grep -s -q "db.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.pr
 grep -s -q "db.simulator.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.simulator.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
 
 if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
-    echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util and put it in 
+    echo Please download vhd-util from http://cloudstack.apt-get.eu/tools/vhd-util and put it in
     echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/
 fi
 

packaging/centos7/cloud.spec

@@ -402,7 +402,7 @@ grep -s -q "db.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.pr
 grep -s -q "db.simulator.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.simulator.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
 
 if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
-    echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util and put it in
+    echo Please download vhd-util from http://cloudstack.apt-get.eu/tools/vhd-util and put it in
     echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/
 fi
 

packaging/fedora20/cloud.spec

@@ -408,7 +408,7 @@ if [ "$1" == "1" ] ; then
 fi
 
 if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
-    echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util and put it in 
+    echo Please download vhd-util from http://cloudstack.apt-get.eu/tools/vhd-util and put it in
     echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/
 fi
 

server/src/com/cloud/server/ConfigurationServerImpl.java

@@ -564,15 +564,15 @@ private void generateDefaultKeystore(String keystorePath) throws IOException {
             // Simple check to see if we got IP Address...
             boolean isIPAddress = Pattern.matches("[0-9]$", group[group.length - 1]);
             if (isIPAddress) {
-                ou = "cloud.com";
+                ou = "cloud.com"; // leaving this example reference to cloud.com as it has no real world relevance
             } else {
                 ou = group[group.length - 1];
                 for (int i = group.length - 2; i >= 0 && i >= group.length - 3; i--)
                     ou = group[i] + "." + ou;
             }
         } catch (UnknownHostException ex) {
             s_logger.info("Fail to get user's domain name. Would use cloud.com. ", ex);
-            ou = "cloud.com";
+            ou = "cloud.com"; // leaving this example reference to cloud.com as it has no real world relevance
         }
 
         String o = ou;
@@ -1055,6 +1055,7 @@ private DiskOfferingVO createdefaultDiskOffering(Long domainId, String name, Str
 
         DiskOfferingVO newDiskOffering = new DiskOfferingVO(domainId, name, description, provisioningType, diskSize, tags, isCustomized, null, null, null);
         newDiskOffering.setUniqueName("Cloud.Com-" + name);
+        // leaving the above reference to cloud.com in as it is an identifyer and has no real world relevance
         newDiskOffering.setSystemUse(isSystemUse);
         newDiskOffering = _diskOfferingDao.persistDeafultDiskOffering(newDiskOffering);
         return newDiskOffering;
@@ -1066,6 +1067,7 @@ private ServiceOfferingVO createServiceOffering(long userId, String name, int cp
         ServiceOfferingVO offering =
                 new ServiceOfferingVO(name, cpu, ramSize, speed, null, null, offerHA, displayText, provisioningType, localStorageRequired, false, tags, false, null, false);
         offering.setUniqueName("Cloud.Com-" + name);
+        // leaving the above reference to cloud.com in as it is an identifyer and has no real world relevance
         offering = _serviceOfferingDao.persistSystemServiceOffering(offering);
         return offering;
     }

systemvm/scripts/run.sh

@@ -54,7 +54,7 @@ do
   grep 'stop' /usr/local/cloud/systemvm/user_request &>/dev/null
   if [ $? -eq 0 ]; then
       timestamp=$(date)
-      echo "$timestamp User stops cloud.com service" >> /var/log/cloud.log
+      echo "$timestamp User stops Apache CloudStack service" >> /var/log/cloud.log
       exit 0
   fi
   sleep 5

systemvm/scripts/ssvm-check.sh

@@ -56,16 +56,16 @@ fi
 
 # check dns resolve
 echo ================================================
-nslookup download.cloud.com 1> /tmp/dns 2>&1
+nslookup cloudstack.apache.org 1> /tmp/dns 2>&1
 grep 'no servers could' /tmp/dns 1> /dev/null 2>&1
 if [ $? -eq 0 ]
 then
-    echo "ERROR: DNS not resolving download.cloud.com"
+    echo "ERROR: DNS not resolving cloudstack.apache.org"
     echo resolv.conf follows
     cat /etc/resolv.conf
     exit 2
 else
-    echo "Good: DNS resolves download.cloud.com"
+    echo "Good: DNS resolves cloudstack.apache.org"
 fi
 
 

test/integration/component/test_browse_templates.py

@@ -874,7 +874,7 @@ def ssvm_internals(self):
                 self.skipTest("Marvin configuration has no host credentials to check router services")
         res = str(result)
         self.debug("Cloud Process status: %s" % res)
-        # cloud.com service (type=secstorage) is running: process id: 2346
+        # Apache CloudStack service (type=secstorage) is running: process id: 2346
         self.assertEqual(
                             res.count("is running"),
                             1,