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

DaanHoogland · yadvr · commit f07d729086e0 · 2017-04-20T11:35:36.000+05:30
- 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'
diff --git a/api/src/com/cloud/offering/ServiceOffering.java b/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
diff --git a/api/src/com/cloud/resource/ResourceService.java b/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
diff --git a/api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java b/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)
diff --git a/packaging/centos63/cloud.spec b/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
 
diff --git a/packaging/centos7/cloud.spec b/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
 
diff --git a/packaging/fedora20/cloud.spec b/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
 
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/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;
     }
diff --git a/systemvm/scripts/run.sh b/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
diff --git a/systemvm/scripts/ssvm-check.sh b/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
 
 
diff --git a/test/integration/component/test_browse_templates.py b/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,
diff --git a/test/integration/component/test_browse_volumes.py b/test/integration/component/test_browse_volumes.py
@@ -1306,7 +1306,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,
diff --git a/test/integration/smoke/test_ssvm.py b/test/integration/smoke/test_ssvm.py
@@ -480,7 +480,7 @@ def test_03_ssvm_internals(self):
                             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,
diff --git a/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh b/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh
@@ -22,7 +22,7 @@ set -x
 function install_vhd_util() {
   [[ -f /bin/vhd-util ]] && return
 
-  wget --no-check-certificate http://download.cloud.com.s3.amazonaws.com/tools/vhd-util -O /bin/vhd-util
+  wget --no-check-certificate http://cloudstack.apt-get.eu/tools/vhd-util -O /bin/vhd-util
   chmod a+x /bin/vhd-util
 }
 
diff --git a/tools/devcloud4/advanced/README.md b/tools/devcloud4/advanced/README.md
@@ -54,7 +54,7 @@ vagrant up
 
 	```bash
 	cd /path/to/cloudstack/repo
-	wget http://download.cloud.com.s3.amazonaws.com/tools/vhd-util -P scripts/vm/hypervisor/xenserver/
+	wget http://cloudstack.apt-get.eu/tools/vhd-util -P scripts/vm/hypervisor/xenserver/
 	chmod +x scripts/vm/hypervisor/xenserver/vhd-util
 	```
 
diff --git a/tools/devcloud4/basic/README.md b/tools/devcloud4/basic/README.md
@@ -44,7 +44,7 @@ vagrant up
 
 	```bash
 	cd /path/to/cloudstack/repo
-	wget http://download.cloud.com.s3.amazonaws.com/tools/vhd-util -P scripts/vm/hypervisor/xenserver/
+	wget http://cloudstack.apt-get.eu/tools/vhd-util -P scripts/vm/hypervisor/xenserver/
 	chmod +x scripts/vm/hypervisor/xenserver/vhd-util
 	```
 
diff --git a/tools/docker/Dockerfile.centos6 b/tools/docker/Dockerfile.centos6
@@ -34,7 +34,7 @@ RUN cd /etc/cloudstack/management; \
     ln -s server-nonssl.xml server.xml; \
     ln -s log4j-cloud.xml log4j.xml; \
     wget -O /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util \
-    http://download.cloud.com.s3.amazonaws.com/tools/vhd-util
+    http://cloudstack.apt-get.eu/tools/vhd-util
 
 COPY init.sh_centos6 /root/init.sh
 COPY systemtpl.sh /root/systemtpl.sh
diff --git a/ui/scripts/cloud.core.callbacks.js b/ui/scripts/cloud.core.callbacks.js
@@ -24,7 +24,7 @@ $.urlParam = function(name) {
 
 /*
 This file is meant to help with implementing single signon integration.  If you are using the
-cloud.com default UI, there is no need to touch this file.
+default Apache CloudStack UI, there is no need to touch this file.
 */
 
 /*
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java
@@ -282,7 +282,7 @@ public String[] getVmdkFileChain(String rootVmdkDatastoreFullPath) throws Except
 
             if (parentFileName.startsWith("/")) {
                 // when parent file is not at the same directory as it is, assume it is at parent directory
-                // this is only valid in cloud.com primary storage deployment
+                // this is only valid in Apache CloudStack primary storage deployment
                 DatastoreFile dsFile = new DatastoreFile(currentVmdkFullPath);
                 String dir = dsFile.getDir();
                 if (dir != null && dir.lastIndexOf('/') > 0)
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostDatastoreSystemMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostDatastoreSystemMO.java
@@ -49,7 +49,7 @@ public HostDatastoreSystemMO(VmwareContext context, String morType, String morVa
     }
 
     public ManagedObjectReference findDatastore(String name) throws Exception {
-        // added cloud.com specific name convention, we will use custom field "cloud.uuid" as datastore name as well
+        // added Apache CloudStack specific name convention, we will use custom field "cloud.uuid" as datastore name as well
         CustomFieldsManagerMO cfmMo = new CustomFieldsManagerMO(_context, _context.getServiceContent().getCustomFieldsManager());
         int key = cfmMo.getCustomFieldKey("Datastore", CustomFieldConstants.CLOUD_UUID);
         assert (key != 0);

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public interface ResourceService {`
`53`	`53`	`Host reconnectHost(ReconnectHostCmd cmd);`
`54`	`54`
`55`	`55`	`/**`
`56`		`- * We will automatically create a cloud.com cluster to attach to the external cluster and return a hyper host to perform`
	`56`	`+ * We will automatically create an Apache CloudStack cluster to attach to the external cluster and return a hyper host to perform`
`57`	`57`	`* host related operation within the cluster`
`58`	`58`	`*`
`59`	`59`	`* @param cmd`