Skip to content

Commit 32379af

Browse files
author
James Regis
committed
[vpc/baremetal] Remove comment block
1 parent 362fe66 commit 32379af

File tree

1 file changed

+11
-49
lines changed

1 file changed

+11
-49
lines changed

ibmcloud_python_sdk/vpc/baremetal.py

Lines changed: 11 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -820,29 +820,29 @@ def create_bare_metal_server_interface(self, **kwargs):
820820
def associate_floating_ip(self, **kwargs):
821821
"""Associate floating IP with a network interface on an bare metal server
822822
823-
:param bare_metal_server: Bare metal server name or ID
824-
:type bare_metal_server: str
823+
:param server: Bare metal server name or ID
824+
:type server: str
825825
:param interface: The network interface name or ID¨
826826
:type interface: str
827827
:param fip: The floting IP name, ID or address
828828
:type fip: str
829829
"""
830-
args = ["bare_metal_server", "interface", "fip"]
830+
args = ["server", "interface", "fip"]
831831
check_args(args, **kwargs)
832832

833833
args = {
834-
'bare_metal_server': kwargs.get('bare_metal_server'),
834+
'server': kwargs.get('server'),
835835
'interface': kwargs.get('interface'),
836836
'fip': kwargs.get('fip'),
837837
}
838838

839-
bare_metal_server_info = self.get_server(
840-
args["bare_metal_server"])
841-
if "errors" in bare_metal_server_info:
842-
return bare_metal_server_info
839+
server_info = self.get_server(
840+
args["server"])
841+
if "errors" in server_info:
842+
return server_info
843843

844844
interface_info = self.get_server_interface(
845-
bare_metal_server_info["id"],
845+
server_info["id"],
846846
args["interface"])
847847
if "errors" in interface_info:
848848
return interface_info
@@ -855,7 +855,7 @@ def associate_floating_ip(self, **kwargs):
855855
path = ("/v1/bare_metal_servers/{}/network_interfaces/{}"
856856
"/floating_ips/{}"
857857
"?version={}&generation={}".format(
858-
bare_metal_server_info["id"],
858+
server_info["id"],
859859
interface_info["id"],
860860
fip_info["id"],
861861
self.cfg["version"],
@@ -868,7 +868,7 @@ def associate_floating_ip(self, **kwargs):
868868
" for bare metal server {}. {}".format(
869869
fip_info["id"],
870870
interface_info["id"],
871-
bare_metal_server_info["id"], error))
871+
server_info["id"], error))
872872
raise
873873

874874
def attach_volume(self, **kwargs):
@@ -1045,41 +1045,3 @@ def disassociate_floating_ip(self, bare_metal_server, interface, fip):
10451045
fip, interface, bare_metal_server,
10461046
error))
10471047
raise
1048-
1049-
# def detach_volume(self, bare_metal_server, attachment):
1050-
# """Detach volume from an bare metal server
1051-
1052-
# :param bare_metal_server: Bare metal server name or ID
1053-
# :type bare_metal_server: str
1054-
# :param attachment: Volume attachement name or ID
1055-
# :type attachment: str
1056-
# """
1057-
# try:
1058-
# bare_metal_server_info = self.get_instance(bare_metal_server)
1059-
# if "errors" in bare_metal_server_info:
1060-
# return bare_metal_server_info
1061-
1062-
# attachment_info = self.get_server_volume_attachment(
1063-
# bare_metal_server_info["id"], attachment)
1064-
# if "errors" in attachment_info:
1065-
# return attachment_info
1066-
1067-
# path = ("/v1/bare_metal_servers/{}/volume_attachments/{}"
1068-
# "?version={}&generation={}".format(
1069-
# bare_metal_server_info["id"],
1070-
# attachment_info["id"],
1071-
# self.cfg["version"],
1072-
# self.cfg["generation"]))
1073-
1074-
# data = qw("iaas", "DELETE", path, headers())
1075-
1076-
# if data["response"].status != 204:
1077-
# return data["data"]
1078-
1079-
# return resource_deleted()
1080-
1081-
# except Exception as error:
1082-
# print("Error detaching volume with attachment {} from"
1083-
# "bare metal server"
1084-
# " {}. {}".format(attachment, bare_metal_server, error))
1085-
# raise

0 commit comments

Comments
 (0)