소스 검색

Replace the path where AWS instance data info is retrieved from to point to an S3 bucket (much faster and no occasional auth issues)

Enis Afgan 10 년 전
부모
커밋
5b9f726234
2개의 변경된 파일3개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 2
      cloudbridge/cloud/providers/aws/provider.py
  2. 2 2
      cloudbridge/cloud/providers/aws/services.py

+ 1 - 2
cloudbridge/cloud/providers/aws/provider.py

@@ -177,8 +177,7 @@ class MockAWSCloudProvider(AWSCloudProvider, TestMockHelperMixin):
         self.s3mock.start()
         self.s3mock.start()
         HTTPretty.register_uri(
         HTTPretty.register_uri(
             method="GET",
             method="GET",
-            uri="https://swift.rc.nectar.org.au:8888/v1/"
-            "AUTH_377/cloud-bridge/aws/instance_data.json",
+            uri="https://cloudbridgelib.s3.amazonaws.com/aws_instance_data.json",
             body="""
             body="""
 [
 [
   {
   {

+ 2 - 2
cloudbridge/cloud/providers/aws/services.py

@@ -598,8 +598,8 @@ class AWSInstanceService(BaseInstanceService):
                                      reservations.next_token,
                                      reservations.next_token,
                                      False, data=instances)
                                      False, data=instances)
 
 
-AWS_INSTANCE_DATA_DEFAULT_URL = "https://swift.rc.nectar.org.au:8888/v1/" \
-                                "AUTH_377/cloud-bridge/aws/instance_data.json"
+AWS_INSTANCE_DATA_DEFAULT_URL = "https://cloudbridgelib.s3.amazonaws.com/" \
+                                "aws_instance_data.json"
 
 
 
 
 class AWSInstanceTypesService(BaseInstanceTypesService):
 class AWSInstanceTypesService(BaseInstanceTypesService):