Merge branch 'trunk' into update_changes

micafer · web-flow · commit 98764a68a32a · 2026-02-11T13:04:43.000+01:00
diff --git a/libcloud/common/google.py b/libcloud/common/google.py
@@ -126,7 +126,7 @@ def _from_utc_timestamp(timestamp):
 
 def _get_gce_metadata(path="", retry_failed: Optional[bool] = None):
     try:
-        url = "http://metadata/computeMetadata/v1/" + path.lstrip("/")
+        url = "http://metadata.google.internal/computeMetadata/v1/" + path.lstrip("/")
         headers = {"Metadata-Flavor": "Google"}
         response = get_response_object(url, headers=headers, retry_failed=retry_failed)
         return response.status, "", response.body
diff --git a/libcloud/compute/drivers/openstack.py b/libcloud/compute/drivers/openstack.py
@@ -2473,6 +2473,7 @@ def _to_node(self, api_node):
                 power_state=api_node.get("OS-EXT-STS:power_state", None),
                 progress=api_node.get("progress", None),
                 fault=api_node.get("fault"),
+                hypervisor_hostname=api_node.get("OS-EXT-SRV-ATTR:hypervisor_hostname"),
             ),
         )
 
diff --git a/libcloud/dns/drivers/cloudflare.py b/libcloud/dns/drivers/cloudflare.py
@@ -516,8 +516,6 @@ def _to_zone(self, item):
 
     def _to_record(self, zone, item):
         name = item["name"]
-        name = name.replace("." + item["zone_name"], "")
-        name = name.replace(item["zone_name"], "")
         name = name or None
 
         ttl = item.get("ttl")
diff --git a/libcloud/test/compute/fixtures/gce/project.json b/libcloud/test/compute/fixtures/gce/project.json
@@ -15,7 +15,7 @@
    },
    {
     "key": "startup-script",
-    "value": "#!/bin/bash\n\nAUTO_SCRIPT=$(curl -s http://metadata/computeMetadata/v1/instance/attributes/my-auto-script -H \"Metadata-Flavor: Google\")\nCHECK=${AUTO_SCRIPT:-disabled}\n\nif [ \"${CHECK}\" = \"enabled\" -a -f /etc/debian_version ]; then\n    export DEBIAN_FRONTEND=noninteractive\n    apt-get -q -y update\n    apt-get -q -y install git vim tmux\n    fi\nexit 0\n"
+    "value": "#!/bin/bash\n\nAUTO_SCRIPT=$(curl -s http://metadata.google.internal/computeMetadata/v1/instance/attributes/my-auto-script -H \"Metadata-Flavor: Google\")\nCHECK=${AUTO_SCRIPT:-disabled}\n\nif [ \"${CHECK}\" = \"enabled\" -a -f /etc/debian_version ]; then\n    export DEBIAN_FRONTEND=noninteractive\n    apt-get -q -y update\n    apt-get -q -y install git vim tmux\n    fi\nexit 0\n"
    }
   ]
  },
diff --git a/libcloud/test/dns/fixtures/cloudflare/record_GET.json b/libcloud/test/dns/fixtures/cloudflare/record_GET.json
@@ -8,8 +8,6 @@
     "proxied": true,
     "ttl": 1,
     "locked": false,
-    "zone_id": "1234",
-    "zone_name": "example.com",
     "modified_on": "2018-12-22T21:28:00.801892Z",
     "created_on": "2018-12-22T21:28:00.801892Z",
     "meta": {
diff --git a/libcloud/test/dns/fixtures/cloudflare/record_PUT.json b/libcloud/test/dns/fixtures/cloudflare/record_PUT.json
@@ -8,8 +8,6 @@
     "proxied": true,
     "ttl": 1,
     "locked": false,
-    "zone_id": "1234",
-    "zone_name": "example.com",
     "modified_on": "2018-12-22T21:28:00.801892Z",
     "created_on": "2018-12-22T21:28:00.801892Z",
     "meta": {
diff --git a/libcloud/test/dns/fixtures/cloudflare/records_GET_1.json b/libcloud/test/dns/fixtures/cloudflare/records_GET_1.json
@@ -9,8 +9,6 @@
       "proxied": true,
       "ttl": 1,
       "locked": false,
-      "zone_id": "1234",
-      "zone_name": "example.com",
       "modified_on": "2018-12-22T21:28:00.801892Z",
       "created_on": "2018-12-22T21:28:00.801892Z",
       "meta": {
@@ -28,8 +26,6 @@
       "proxied": true,
       "ttl": 1,
       "locked": false,
-      "zone_id": "1234",
-      "zone_name": "example.com",
       "modified_on": "2018-12-22T21:28:03.346998Z",
       "created_on": "2018-12-22T21:28:03.346998Z",
       "meta": {
@@ -47,8 +43,6 @@
       "proxied": false,
       "ttl": 1,
       "locked": false,
-      "zone_id": "1234",
-      "zone_name": "example.com",
       "modified_on": "2018-12-22T20:29:48.453923Z",
       "created_on": "2018-12-22T20:29:48.453923Z",
       "meta": {
@@ -66,8 +60,6 @@
       "proxied": false,
       "ttl": 1,
       "locked": false,
-      "zone_id": "1234",
-      "zone_name": "example.com",
       "modified_on": "2019-05-30T01:43:01.509188Z",
       "created_on": "2019-05-30T01:43:01.509188Z",
       "meta": {
@@ -85,8 +77,6 @@
       "proxied": true,
       "ttl": 1,
       "locked": false,
-      "zone_id": "1234",
-      "zone_name": "example.com",
       "modified_on": "2018-12-22T21:29:46.874918Z",
       "created_on": "2018-12-22T21:29:46.874918Z",
       "meta": {
@@ -111,9 +101,7 @@
       "proxiable": false,
       "proxied": false,
       "ttl": 1,
-      "type": "MX",
-      "zone_id": "1234",
-      "zone_name": "foo.bar"
+      "type": "MX"
     }
   ],
   "result_info": {
diff --git a/libcloud/test/dns/fixtures/cloudflare/records_GET_2.json b/libcloud/test/dns/fixtures/cloudflare/records_GET_2.json
@@ -10,8 +10,6 @@
       "ttl": 1,
       "priority": 1,
       "locked": false,
-      "zone_id": "1234",
-      "zone_name": "example.com",
       "modified_on": "2018-12-22T20:29:48.532399Z",
       "created_on": "2018-12-22T20:29:48.532399Z",
       "meta": {
@@ -30,8 +28,6 @@
       "ttl": 1,
       "priority": 2,
       "locked": false,
-      "zone_id": "1234",
-      "zone_name": "example.com",
       "modified_on": "2018-12-22T20:29:48.540671Z",
       "created_on": "2018-12-22T20:29:48.540671Z",
       "meta": {
@@ -49,8 +45,6 @@
       "proxied": false,
       "ttl": 1,
       "locked": false,
-      "zone_id": "1234",
-      "zone_name": "example.com",
       "modified_on": "2018-12-22T20:29:48.512931Z",
       "created_on": "2018-12-22T20:29:48.512931Z",
       "meta": {
@@ -68,8 +62,6 @@
       "proxied": false,
       "ttl": 1,
       "locked": false,
-      "zone_id": "1234",
-      "zone_name": "example.com",
       "modified_on": "2018-12-22T20:29:48.523230Z",
       "created_on": "2018-12-22T20:29:48.523230Z",
       "meta": {
@@ -80,8 +72,6 @@
     },
     {
             "id": "r8",
-            "zone_id": "1234",
-            "zone_name": "foo.bar",
             "name": "test1",
             "type": "CAA",
             "content": "0\tissue\ttest.example.com",
diff --git a/libcloud/test/dns/fixtures/cloudflare/records_POST.json b/libcloud/test/dns/fixtures/cloudflare/records_POST.json
@@ -8,8 +8,6 @@
     "proxied": true,
     "ttl": 1,
     "locked": false,
-    "zone_id": "1234",
-    "zone_name": "example.com",
     "modified_on": "2018-12-22T21:28:00.801892Z",
     "created_on": "2018-12-22T21:28:00.801892Z",
     "meta": {
diff --git a/libcloud/test/dns/fixtures/cloudflare/records_POST_sshfp.json b/libcloud/test/dns/fixtures/cloudflare/records_POST_sshfp.json
@@ -8,8 +8,6 @@
     "proxied": true,
     "ttl": 1,
     "locked": false,
-    "zone_id": "1234",
-    "zone_name": "example.com",
     "modified_on": "2018-12-22T21:28:00.801892Z",
     "created_on": "2018-12-22T21:28:00.801892Z",
     "meta": {
diff --git a/libcloud/test/dns/test_cloudflare.py b/libcloud/test/dns/test_cloudflare.py
@@ -70,7 +70,7 @@ def test_get_record(self):
         record = self.driver.get_record("1234", "364797364")
 
         self.assertEqual(record.id, "364797364")
-        self.assertIsNone(record.name)
+        self.assertEqual(record.name, "example.com")
         self.assertEqual(record.type, "A")
         self.assertEqual(record.data, "192.30.252.153")
 
@@ -89,7 +89,7 @@ def test_list_records(self):
 
         record = records[0]
         self.assertEqual(record.id, "364797364")
-        self.assertIsNone(record.name)
+        self.assertEqual(record.name, "example.com")
         self.assertEqual(record.type, "A")
         self.assertEqual(record.data, "192.30.252.153")
         self.assertEqual(record.extra["priority"], None)
@@ -108,7 +108,7 @@ def test_list_records(self):
 
         record = [r for r in records if r.type == "MX"][0]
         self.assertEqual(record.id, "78526")
-        self.assertIsNone(record.name)
+        self.assertEqual(record.name, "foo.bar")
         self.assertEqual(record.type, "MX")
         self.assertEqual(record.data, "aspmx3.googlemail.com")
         self.assertEqual(record.extra["priority"], 30)
@@ -143,7 +143,7 @@ def test_create_record(self):
             extra={"proxied": True},
         )
         self.assertEqual(record.id, "412561327")
-        self.assertEqual(record.name, "test5")
+        self.assertEqual(record.name, "test5.example.com")
         self.assertEqual(record.type, "A")
         self.assertEqual(record.data, "127.0.0.3")
 
@@ -155,7 +155,7 @@ def test_create_record_SSHFP_record_type(self):
             name="test_sshfp", zone=zone, type=RecordType.SSHFP, data="2 1 ABCDEF12345"
         )
         self.assertEqual(record.id, "200")
-        self.assertEqual(record.name, "test_sshfp")
+        self.assertEqual(record.name, "test_sshfp.example.com")
         self.assertEqual(record.type, "SSHFP")
         self.assertEqual(record.data, "2 1 ABCDEF12345")
 
@@ -167,7 +167,7 @@ def test_create_record_CAA_record_type(self):
             name="test5", zone=zone, type=RecordType.CAA, data="0 issue caa.example.com"
         )
         self.assertEqual(record.id, "412561327")
-        self.assertEqual(record.name, "test5")
+        self.assertEqual(record.name, "test5.example.com")
         self.assertEqual(record.type, "A")
         self.assertEqual(record.data, "127.0.0.3")
 
@@ -214,7 +214,7 @@ def test_update_record(self):
             extra={"proxied": True},
         )
 
-        self.assertEqual(updated_record.name, "test6")
+        self.assertEqual(updated_record.name, "test6.example.com")
         self.assertEqual(updated_record.type, "A")
         self.assertEqual(updated_record.data, "127.0.0.4")
         self.assertEqual(updated_record.extra["proxied"], True)

Original file line number	Diff line number	Diff line change
`@@ -2473,6 +2473,7 @@ def _to_node(self, api_node):`
`2473`	`2473`	`power_state=api_node.get("OS-EXT-STS:power_state", None),`
`2474`	`2474`	`progress=api_node.get("progress", None),`
`2475`	`2475`	`fault=api_node.get("fault"),`
	`2476`	`+ hypervisor_hostname=api_node.get("OS-EXT-SRV-ATTR:hypervisor_hostname"),`
`2476`	`2477`	`),`
`2477`	`2478`	`)`
`2478`	`2479`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`},`
`16`	`16`	`{`
`17`	`17`	`"key": "startup-script",`
`18`		`- "value": "#!/bin/bash\n\nAUTO_SCRIPT=$(curl -s http://metadata/computeMetadata/v1/instance/attributes/my-auto-script -H \"Metadata-Flavor: Google\")\nCHECK=${AUTO_SCRIPT:-disabled}\n\nif [ \"${CHECK}\" = \"enabled\" -a -f /etc/debian_version ]; then\n export DEBIAN_FRONTEND=noninteractive\n apt-get -q -y update\n apt-get -q -y install git vim tmux\n fi\nexit 0\n"`
	`18`	`+ "value": "#!/bin/bash\n\nAUTO_SCRIPT=$(curl -s http://metadata.google.internal/computeMetadata/v1/instance/attributes/my-auto-script -H \"Metadata-Flavor: Google\")\nCHECK=${AUTO_SCRIPT:-disabled}\n\nif [ \"${CHECK}\" = \"enabled\" -a -f /etc/debian_version ]; then\n export DEBIAN_FRONTEND=noninteractive\n apt-get -q -y update\n apt-get -q -y install git vim tmux\n fi\nexit 0\n"`
`19`	`19`	`}`
`20`	`20`	`]`
`21`	`21`	`},`