Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas

Conflicts:
	airtime_mvc/application/models/Schedule.php

python_apps/airtime_analyzer/setup.py

@@ -30,6 +30,11 @@ setup(name='airtime_analyzer',
           'python-daemon',
           'requests',
           'apache-libcloud',
+          # These next 3 are required for requests to support SSL with SNI. Learned this the hard way...
+          # What sucks is that GCC is required to pip install these. 
+          #'ndg-httpsclient',
+          #'pyasn1',
+          #'pyopenssl'
       ],
       zip_safe=False,
       data_files=data_files)

python_apps/pypo/pypofile.py

@@ -136,9 +136,9 @@ class PypoFile(Thread):
                     """
                     If an object_name exists the file is stored on Amazon S3
                     """
-                    if 'object_name' in media_item:
+                    if 'amazonS3_resource_id' in media_item:
                         csd = CloudStorageDownloader()
-                        csd.download_obj(media_item['dst'], media_item['object_name'])
+                        csd.download_obj(media_item['dst'], media_item['amazonS3_resource_id'])
                         media_item['file_ready'] = True
                     else:
                         self.copy_file(media_item)