From 73ea275c20d196c3f9a31d4af3287d1818b692f2 Mon Sep 17 00:00:00 2001 From: ATGE Date: Tue, 28 Jul 2020 18:37:06 -0400 Subject: [PATCH 1/2] #1305 update the old Bluemix URLs to the IBM Cloud Docs URL --- CHANGELOG.md | 2 +- SoftLayer/CLI/block/order.py | 2 +- SoftLayer/CLI/file/order.py | 2 +- SoftLayer/CLI/image/export.py | 6 ++++-- SoftLayer/CLI/image/import.py | 10 +++++----- SoftLayer/managers/image.py | 2 +- SoftLayer/managers/vs_capacity.py | 2 +- docs/cli/vs/reserved_capacity.rst | 4 ++-- 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b6b28c4e..de7ae2c03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -228,7 +228,7 @@ https://github.com/softlayer/softlayer-python/compare/v5.8.2...v5.8.3 ## [5.6.0] - 2018-10-16 - Changes: https://github.com/softlayer/softlayer-python/compare/v5.5.3...v5.6.0 -+ #1026 Support for [Reserved Capacity](https://console.bluemix.net/docs/vsi/vsi_about_reserved.html#about-reserved-virtual-servers) ++ #1026 Support for [Reserved Capacity](https://cloud.ibm.com/docs/virtual-servers?topic=virtual-servers-about-reserved-virtual-servers) * `slcli vs capacity create` * `slcli vs capacity create-guest` * `slcli vs capacity create-options` diff --git a/SoftLayer/CLI/block/order.py b/SoftLayer/CLI/block/order.py index 302b45cc8..738080fd0 100644 --- a/SoftLayer/CLI/block/order.py +++ b/SoftLayer/CLI/block/order.py @@ -63,7 +63,7 @@ def cli(env, storage_type, size, iops, tier, os_type, """Order a block storage volume. Valid size and iops options can be found here: - https://console.bluemix.net/docs/infrastructure/BlockStorage/index.html#provisioning + https://cloud.ibm.com/docs/BlockStorage/index.html#provisioning-considerations """ block_manager = SoftLayer.BlockStorageManager(env.client) storage_type = storage_type.lower() diff --git a/SoftLayer/CLI/file/order.py b/SoftLayer/CLI/file/order.py index 9e1c9cd29..e665a088b 100644 --- a/SoftLayer/CLI/file/order.py +++ b/SoftLayer/CLI/file/order.py @@ -52,7 +52,7 @@ def cli(env, storage_type, size, iops, tier, """Order a file storage volume. Valid size and iops options can be found here: - https://console.bluemix.net/docs/infrastructure/FileStorage/index.html#provisioning + https://cloud.ibm.com/docs/FileStorage/index.html#provisioning-considerations """ file_manager = SoftLayer.FileStorageManager(env.client) storage_type = storage_type.lower() diff --git a/SoftLayer/CLI/image/export.py b/SoftLayer/CLI/image/export.py index eb9081ac7..c8215c28c 100644 --- a/SoftLayer/CLI/image/export.py +++ b/SoftLayer/CLI/image/export.py @@ -16,8 +16,10 @@ default=None, help="The IBM Cloud API Key with access to IBM Cloud Object " "Storage instance. For help creating this key see " - "https://console.bluemix.net/docs/services/cloud-object-" - "storage/iam/users-serviceids.html#serviceidapikeys") + "https://cloud.ibm.com/docs/cloud-object-storage?" + "topic=cloud-object-storage-iam-overview#iam-overview" + "-service-id-api-key " + ) @environment.pass_env def cli(env, identifier, uri, ibm_api_key): """Export an image to object storage. diff --git a/SoftLayer/CLI/image/import.py b/SoftLayer/CLI/image/import.py index 53082c9ac..83d2abcf2 100644 --- a/SoftLayer/CLI/image/import.py +++ b/SoftLayer/CLI/image/import.py @@ -22,17 +22,17 @@ default=None, help="The IBM Cloud API Key with access to IBM Cloud Object " "Storage instance and IBM KeyProtect instance. For help " - "creating this key see https://console.bluemix.net/docs/" - "services/cloud-object-storage/iam/users-serviceids.html" - "#serviceidapikeys") + "creating this key see https://cloud.ibm.com/docs/" + "cloud-object-storage?topic=cloud-object-storage" + "-iam-overview#iam-overview-service-id-api-key") @click.option('--root-key-crn', default=None, help="CRN of the root key in your KMS instance") @click.option('--wrapped-dek', default=None, help="Wrapped Data Encryption Key provided by IBM KeyProtect. " - "For more info see https://console.bluemix.net/docs/" - "services/key-protect/wrap-keys.html#wrap-keys") + "For more info see " + "https://cloud.ibm.com/docs/key-protect?topic=key-protect-wrap-keys") @click.option('--cloud-init', is_flag=True, help="Specifies if image is cloud-init") diff --git a/SoftLayer/managers/image.py b/SoftLayer/managers/image.py index d30b05305..b76a959a6 100644 --- a/SoftLayer/managers/image.py +++ b/SoftLayer/managers/image.py @@ -17,7 +17,7 @@ class ImageManager(utils.IdentifierMixin, object): """Manages SoftLayer server images. See product information here: - https://console.bluemix.net/docs/infrastructure/image-templates/image_index.html + https://cloud.ibm.com/docs/image-templates :param SoftLayer.API.BaseClient client: the client instance """ diff --git a/SoftLayer/managers/vs_capacity.py b/SoftLayer/managers/vs_capacity.py index 3f6574f12..813e2d565 100644 --- a/SoftLayer/managers/vs_capacity.py +++ b/SoftLayer/managers/vs_capacity.py @@ -24,7 +24,7 @@ class CapacityManager(utils.IdentifierMixin, object): Product Information - - https://console.bluemix.net/docs/vsi/vsi_about_reserved.html + - https://cloud.ibm.com/docs/virtual-servers?topic=virtual-servers-about-reserved-virtual-servers - https://softlayer.github.io/reference/services/SoftLayer_Virtual_ReservedCapacityGroup/ - https://softlayer.github.io/reference/services/SoftLayer_Virtual_ReservedCapacityGroup_Instance/ diff --git a/docs/cli/vs/reserved_capacity.rst b/docs/cli/vs/reserved_capacity.rst index 3193febff..37e74000c 100644 --- a/docs/cli/vs/reserved_capacity.rst +++ b/docs/cli/vs/reserved_capacity.rst @@ -5,8 +5,8 @@ Working with Reserved Capacity There are two main concepts for Reserved Capacity. The `Reserved Capacity Group `_ and the `Reserved Capacity Instance `_ The Reserved Capacity Group, is a set block of capacity set aside for you at the time of the order. It will contain a set number of Instances which are all the same size. Instances can be ordered like normal VSIs, with the exception that you need to include the reservedCapacityGroupId, and it must be the same size as the group you are ordering the instance in. -- `About Reserved Capacity `_ -- `Reserved Capacity FAQ `_ +- `About Reserved Capacity `_ +- `Reserved Capacity FAQ `_ The SLCLI supports some basic Reserved Capacity Features. From 95ad3be5be757c53ecf1b0732237eda4acaf54f8 Mon Sep 17 00:00:00 2001 From: ATGE Date: Wed, 29 Jul 2020 19:13:11 -0400 Subject: [PATCH 2/2] 1305 update softlayer.com urls to ibm.com/cloud urls --- SoftLayer/managers/block.py | 2 +- SoftLayer/managers/dns.py | 2 +- SoftLayer/managers/firewall.py | 2 +- SoftLayer/managers/hardware.py | 2 +- SoftLayer/managers/network.py | 2 +- SoftLayer/managers/object_storage.py | 2 +- SoftLayer/managers/ssl.py | 2 +- SoftLayer/managers/ticket.py | 2 +- SoftLayer/managers/vs.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/SoftLayer/managers/block.py b/SoftLayer/managers/block.py index 4d129d07c..a16500919 100644 --- a/SoftLayer/managers/block.py +++ b/SoftLayer/managers/block.py @@ -15,7 +15,7 @@ class BlockStorageManager(StorageManager): """Manages SoftLayer Block Storage volumes. - See product information here: http://www.softlayer.com/block-storage + See product information here: https://www.ibm.com/cloud/block-storage """ def list_block_volume_limit(self): diff --git a/SoftLayer/managers/dns.py b/SoftLayer/managers/dns.py index 3a2ea9147..1e89ec9cf 100644 --- a/SoftLayer/managers/dns.py +++ b/SoftLayer/managers/dns.py @@ -14,7 +14,7 @@ class DNSManager(utils.IdentifierMixin, object): """Manage SoftLayer DNS. - See product information here: http://www.softlayer.com/DOMAIN-SERVICES + See product information here: https://www.ibm.com/cloud/dns :param SoftLayer.API.BaseClient client: the client instance diff --git a/SoftLayer/managers/firewall.py b/SoftLayer/managers/firewall.py index 2b1d8e452..34b197521 100644 --- a/SoftLayer/managers/firewall.py +++ b/SoftLayer/managers/firewall.py @@ -32,7 +32,7 @@ def has_firewall(vlan): class FirewallManager(utils.IdentifierMixin, object): """Manages SoftLayer firewalls - See product information here: http://www.softlayer.com/firewalls + See product information here: https://www.ibm.com/cloud/network-security :param SoftLayer.API.BaseClient client: the client instance diff --git a/SoftLayer/managers/hardware.py b/SoftLayer/managers/hardware.py index 8ac8d7edd..3a7acbfbd 100644 --- a/SoftLayer/managers/hardware.py +++ b/SoftLayer/managers/hardware.py @@ -41,7 +41,7 @@ class HardwareManager(utils.IdentifierMixin, object): client = SoftLayer.Client() mgr = SoftLayer.HardwareManager(client) - See product information here: http://www.softlayer.com/bare-metal-servers + See product information here: https://www.ibm.com/cloud/bare-metal-servers :param SoftLayer.API.BaseClient client: the client instance :param SoftLayer.managers.OrderingManager ordering_manager: an optional diff --git a/SoftLayer/managers/network.py b/SoftLayer/managers/network.py index f9c5f4af0..1e9296cac 100644 --- a/SoftLayer/managers/network.py +++ b/SoftLayer/managers/network.py @@ -57,7 +57,7 @@ class NetworkManager(object): """Manage SoftLayer network objects: VLANs, subnets, IPs and rwhois - See product information here: http://www.softlayer.com/networking + See product information here: https://www.ibm.com/cloud/network :param SoftLayer.API.BaseClient client: the client instance diff --git a/SoftLayer/managers/object_storage.py b/SoftLayer/managers/object_storage.py index 2560d26c8..a3a84414b 100644 --- a/SoftLayer/managers/object_storage.py +++ b/SoftLayer/managers/object_storage.py @@ -18,7 +18,7 @@ class ObjectStorageManager(object): """Manager for SoftLayer Object Storage accounts. - See product information here: http://www.softlayer.com/object-storage + See product information here: https://www.ibm.com/cloud/object-storage :param SoftLayer.API.BaseClient client: the client instance diff --git a/SoftLayer/managers/ssl.py b/SoftLayer/managers/ssl.py index 3fa2ac1dd..5474d9cb3 100644 --- a/SoftLayer/managers/ssl.py +++ b/SoftLayer/managers/ssl.py @@ -10,7 +10,7 @@ class SSLManager(object): """Manages SSL certificates in SoftLayer. - See product information here: http://www.softlayer.com/ssl-certificates + See product information here: https://www.ibm.com/cloud/ssl-certificates Example:: diff --git a/SoftLayer/managers/ticket.py b/SoftLayer/managers/ticket.py index 9ff361d4b..bbd2eddd2 100644 --- a/SoftLayer/managers/ticket.py +++ b/SoftLayer/managers/ticket.py @@ -11,7 +11,7 @@ class TicketManager(utils.IdentifierMixin, object): """Manages SoftLayer support tickets. - See product information here: http://www.softlayer.com/support + See product information here: https://www.ibm.com/cloud/support :param SoftLayer.API.BaseClient client: the client instance diff --git a/SoftLayer/managers/vs.py b/SoftLayer/managers/vs.py index 0e27c4cd3..9995e7ec2 100644 --- a/SoftLayer/managers/vs.py +++ b/SoftLayer/managers/vs.py @@ -24,7 +24,7 @@ class VSManager(utils.IdentifierMixin, object): """Manages SoftLayer Virtual Servers. - See product information here: http://www.softlayer.com/virtual-servers + See product information here: https://www.ibm.com/cloud/virtual-servers Example::