Skip to content

Commit f1f1a0b

Browse files
ehdsouzaehdsouza
authored
Merge pull request #665 from watson-developer-cloud/6599-refactor-bluemix
Refactor bluemix to cloud.ibm
2 parents 4c2c9df + 89959c3 commit f1f1a0b

24 files changed

+94
-94
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Before you open an issue, please check if a similar issue already exists or has
1313

1414
**Check service status**
1515

16-
1. For service issues or 5xx errors, first, go to https://console.bluemix.net/status?tags=platform,runtimes,services&view=n:i and check the status of the service.
16+
1. For service issues or 5xx errors, first, go to the [IBM Cloud status page](https://cloud.ibm.com/status?component=compare-comply%2Cdiscovery%2Cconversation%2Cwatson-vision-combined%2Cnatural-language-understanding%2Cnatural-language-classifier%2Clanguage-translator%2Cpersonality-insights%2Cspeech-to-text%2Ctext-to-speech%2Ctone-analyzer&selected=status) and check the status of the service.
1717
1. If the service status is OK, continue with a bug report.
1818

1919
---

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ IBM Cloud has migrated to token-based Identity and Access Management (IAM) authe
140140
You supply either an IAM service **API key** or an **access token**:
141141

142142
- Use the API key to have the SDK manage the lifecycle of the access token. The SDK requests an access token, ensures that the access token is valid, and refreshes it if necessary.
143-
- Use the access token if you want to manage the lifecycle yourself. For details, see [Authenticating with IAM tokens](https://console.bluemix.net/docs/services/watson/getting-started-iam.html).
143+
- Use the access token if you want to manage the lifecycle yourself. For details, see [Authenticating with IAM tokens](https://cloud.ibm.com/docs/services/watson?topic=watson-iam).
144144
- Use a server-side to generate access tokens using your IAM API key for untrusted environments like client-side scripts. The generated access tokens will be valid for one hour and can be refreshed.
145145

146146
### Generating access tokens using IAM API key
@@ -157,7 +157,7 @@ token = iam_token_manager.get_token()
157157
discovery = DiscoveryV1(version='2018-08-01',
158158
url='<url_as_per_region>',
159159
apikey='<apikey>',
160-
iam_url='<iam_url>') # optional - the default value is https://iam.bluemix.net/identity/token
160+
iam_url='<iam_url>') # optional - the default value is https://iam.cloud.ibm.com/identity/token
161161
```
162162

163163
```python
@@ -350,12 +350,12 @@ We'd love to highlight cool open-source projects that use this SDK! If you'd lik
350350
This library is licensed under the [Apache 2.0 license][license].
351351

352352
[wdc]: http://www.ibm.com/watson/developercloud/
353-
[ibm_cloud]: https://console.bluemix.net
354-
[watson-dashboard]: https://console.bluemix.net/dashboard/apps?category=watson
353+
[ibm_cloud]: https://cloud.ibm.com/
354+
[watson-dashboard]: https://cloud.ibm.com/catalog?category=ai
355355
[responses]: https://github.com/getsentry/responses
356356
[requests]: http://docs.python-requests.org/en/latest/
357357
[examples]: https://github.com/watson-developer-cloud/python-sdk/tree/master/examples
358358
[CONTRIBUTING]: https://github.com/watson-developer-cloud/python-sdk/blob/master/CONTRIBUTING.md
359359
[license]: http://www.apache.org/licenses/LICENSE-2.0
360-
[vcap_services]: https://console.bluemix.net/docs/services/watson/getting-started-variables.html
361-
[ibm-cloud-onboarding]: http://console.bluemix.net/registration?target=/developer/watson&cm_sp=WatsonPlatform-WatsonServices-_-OnPageNavLink-IBMWatson_SDKs-_-Python
360+
[vcap_services]: https://cloud.ibm.com/docs/services/watson?topic=watson-vcapServices
361+
[ibm-cloud-onboarding]: https://cloud.ibm.com/registration?target=/developer/watson&cm_sp=WatsonPlatform-WatsonServices-_-OnPageNavLink-IBMWatson_SDKs-_-Python

‎docs/generate_index_html.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ echo '<!DOCTYPE html>
1818
</div>
1919
2020
<p><a href="https://www.ibm.com/watson/developer/">Info</a>
21-
| <a href="https://console.bluemix.net/developer/watson/documentation">Documentation</a>
21+
| <a href="https://cloud.ibm.com/developer/watson/documentation">Documentation</a>
2222
| <a href="https://github.com/watson-developer-cloud/python-sdk">GitHub</a>
2323
| <a href="https://pypi.python.org/pypi/ibm-watson">pypi</a>
2424
</p>

‎examples/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Examples
22
To run the examples, you will need the appropriate service instance
33

4-
1. Go to the IBM Cloud [Dashboard](https://console.bluemix.net/dashboard/apps?category=ai) page.
5-
1. Either click an existing Watson service instance or click [**Create resource > AI**](https://console.bluemix.net/catalog/?category=ai) and create a service instance.
4+
1. Go to the IBM Cloud [Dashboard](https://cloud.ibm.com/) page.
5+
1. Either click an existing Watson service instance or click [**Create resource > AI**](https://cloud.ibm.com/catalog?category=ai) and create a service instance.
66
1. Copy the `url` and either `apikey` or `username` and `password`. Click **Show** if the credentials are masked.

‎examples/assistant_tone_analyzer_integration/tone_detection.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Thresholds for identifying meaningful tones returned by the Watson Tone
1616
Analyzer. Current values are
1717
* based on the recommendations made by the Watson Tone Analyzer at
18-
* https://console.bluemix.net/docs/services/tone-analyzer/using-tone.html
18+
* https://cloud.ibm.com/docs/services/tone-analyzer?topic=tone-analyzer-utgpe
1919
* These thresholds can be adjusted to client/domain requirements.
2020
"""
2121

‎ibm_watson/assistant_v1.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,18 @@ def __init__(
6262
6363
:param str url: The base url to use when contacting the service (e.g.
6464
"https://gateway.watsonplatform.net/assistant/api/assistant/api").
65-
The base url may differ between Bluemix regions.
65+
The base url may differ between IBM Cloud regions.
6666
6767
:param str username: The username used to authenticate with the service.
6868
Username and password credentials are only required to run your
69-
application locally or outside of Bluemix. When running on
70-
Bluemix, the credentials will be automatically loaded from the
69+
application locally or outside of IBM Cloud. When running on
70+
IBM Cloud, the credentials will be automatically loaded from the
7171
`VCAP_SERVICES` environment variable.
7272
7373
:param str password: The password used to authenticate with the service.
7474
Username and password credentials are only required to run your
75-
application locally or outside of Bluemix. When running on
76-
Bluemix, the credentials will be automatically loaded from the
75+
application locally or outside of IBM Cloud. When running on
76+
IBM Cloud, the credentials will be automatically loaded from the
7777
`VCAP_SERVICES` environment variable.
7878
7979
:param str iam_apikey: An API key that can be used to request IAM tokens. If
@@ -86,7 +86,7 @@ def __init__(
8686
made with an expired token will fail.
8787
8888
:param str iam_url: An optional URL for the IAM service API. Defaults to
89-
'https://iam.bluemix.net/identity/token'.
89+
'https://iam.cloud.ibm.com/identity/token'.
9090
"""
9191

9292
BaseService.__init__(

‎ibm_watson/assistant_v2.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,18 @@ def __init__(
6161
6262
:param str url: The base url to use when contacting the service (e.g.
6363
"https://gateway.watsonplatform.net/assistant/api/assistant/api").
64-
The base url may differ between Bluemix regions.
64+
The base url may differ between IBM Cloud regions.
6565
6666
:param str username: The username used to authenticate with the service.
6767
Username and password credentials are only required to run your
68-
application locally or outside of Bluemix. When running on
69-
Bluemix, the credentials will be automatically loaded from the
68+
application locally or outside of IBM Cloud. When running on
69+
IBM Cloud, the credentials will be automatically loaded from the
7070
`VCAP_SERVICES` environment variable.
7171
7272
:param str password: The password used to authenticate with the service.
7373
Username and password credentials are only required to run your
74-
application locally or outside of Bluemix. When running on
75-
Bluemix, the credentials will be automatically loaded from the
74+
application locally or outside of IBM Cloud. When running on
75+
IBM Cloud, the credentials will be automatically loaded from the
7676
`VCAP_SERVICES` environment variable.
7777
7878
:param str iam_apikey: An API key that can be used to request IAM tokens. If
@@ -85,7 +85,7 @@ def __init__(
8585
made with an expired token will fail.
8686
8787
:param str iam_url: An optional URL for the IAM service API. Defaults to
88-
'https://iam.bluemix.net/identity/token'.
88+
'https://iam.cloud.ibm.com/identity/token'.
8989
"""
9090

9191
BaseService.__init__(
@@ -115,7 +115,7 @@ def create_session(self, assistant_id, **kwargs):
115115
:param str assistant_id: Unique identifier of the assistant. You can find the
116116
assistant ID of an assistant on the **Assistants** tab of the Watson Assistant
117117
tool. For information about creating assistants, see the
118-
[documentation](https://console.bluemix.net/docs/services/assistant/assistant-add.html#assistant-add-task).
118+
[documentation](https://cloud.ibm.com/docs/services/assistant?topic=assistant-assistant-add#assistant-add-task).
119119
**Note:** Currently, the v2 API does not support creating assistants.
120120
:param dict headers: A `dict` containing the request headers
121121
:return: A `DetailedResponse` containing the result, headers and HTTP status code.
@@ -152,7 +152,7 @@ def delete_session(self, assistant_id, session_id, **kwargs):
152152
:param str assistant_id: Unique identifier of the assistant. You can find the
153153
assistant ID of an assistant on the **Assistants** tab of the Watson Assistant
154154
tool. For information about creating assistants, see the
155-
[documentation](https://console.bluemix.net/docs/services/assistant/assistant-add.html#assistant-add-task).
155+
[documentation](https://cloud.ibm.com/docs/services/assistant?topic=assistant-assistant-add#assistant-add-task).
156156
**Note:** Currently, the v2 API does not support creating assistants.
157157
:param str session_id: Unique identifier of the session.
158158
:param dict headers: A `dict` containing the request headers
@@ -202,7 +202,7 @@ def message(self,
202202
:param str assistant_id: Unique identifier of the assistant. You can find the
203203
assistant ID of an assistant on the **Assistants** tab of the Watson Assistant
204204
tool. For information about creating assistants, see the
205-
[documentation](https://console.bluemix.net/docs/services/assistant/assistant-add.html#assistant-add-task).
205+
[documentation](https://cloud.ibm.com/docs/services/assistant?topic=assistant-assistant-add#assistant-add-task).
206206
**Note:** Currently, the v2 API does not support creating assistants.
207207
:param str session_id: Unique identifier of the session.
208208
:param MessageInput input: An input object that includes the input text.

‎ibm_watson/compare_comply_v1.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def __init__(
6060
6161
:param str url: The base url to use when contacting the service (e.g.
6262
"https://gateway.watsonplatform.net/compare-comply/api/compare-comply/api").
63-
The base url may differ between Bluemix regions.
63+
The base url may differ between IBM Cloud regions.
6464
6565
:param str iam_apikey: An API key that can be used to request IAM tokens. If
6666
this API key is provided, the SDK will manage the token and handle the
@@ -72,7 +72,7 @@ def __init__(
7272
made with an expired token will fail.
7373
7474
:param str iam_url: An optional URL for the IAM service API. Defaults to
75-
'https://iam.bluemix.net/identity/token'.
75+
'https://iam.cloud.ibm.com/identity/token'.
7676
"""
7777

7878
BaseService.__init__(

‎ibm_watson/discovery_v1.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,18 @@ def __init__(
6565
6666
:param str url: The base url to use when contacting the service (e.g.
6767
"https://gateway.watsonplatform.net/discovery/api/discovery/api").
68-
The base url may differ between Bluemix regions.
68+
The base url may differ between IBM Cloud regions.
6969
7070
:param str username: The username used to authenticate with the service.
7171
Username and password credentials are only required to run your
72-
application locally or outside of Bluemix. When running on
73-
Bluemix, the credentials will be automatically loaded from the
72+
application locally or outside of IBM Cloud. When running on
73+
IBM Cloud, the credentials will be automatically loaded from the
7474
`VCAP_SERVICES` environment variable.
7575
7676
:param str password: The password used to authenticate with the service.
7777
Username and password credentials are only required to run your
78-
application locally or outside of Bluemix. When running on
79-
Bluemix, the credentials will be automatically loaded from the
78+
application locally or outside of IBM Cloud. When running on
79+
IBM Cloud, the credentials will be automatically loaded from the
8080
`VCAP_SERVICES` environment variable.
8181
8282
:param str iam_apikey: An API key that can be used to request IAM tokens. If
@@ -89,7 +89,7 @@ def __init__(
8989
made with an expired token will fail.
9090
9191
:param str iam_url: An optional URL for the IAM service API. Defaults to
92-
'https://iam.bluemix.net/identity/token'.
92+
'https://iam.cloud.ibm.com/identity/token'.
9393
"""
9494

9595
BaseService.__init__(

‎ibm_watson/language_translator_v3.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,18 @@ def __init__(
6363
6464
:param str url: The base url to use when contacting the service (e.g.
6565
"https://gateway.watsonplatform.net/language-translator/api/language-translator/api").
66-
The base url may differ between Bluemix regions.
66+
The base url may differ between IBM Cloud regions.
6767
6868
:param str username: The username used to authenticate with the service.
6969
Username and password credentials are only required to run your
70-
application locally or outside of Bluemix. When running on
71-
Bluemix, the credentials will be automatically loaded from the
70+
application locally or outside of IBM Cloud. When running on
71+
IBM Cloud, the credentials will be automatically loaded from the
7272
`VCAP_SERVICES` environment variable.
7373
7474
:param str password: The password used to authenticate with the service.
7575
Username and password credentials are only required to run your
76-
application locally or outside of Bluemix. When running on
77-
Bluemix, the credentials will be automatically loaded from the
76+
application locally or outside of IBM Cloud. When running on
77+
IBM Cloud, the credentials will be automatically loaded from the
7878
`VCAP_SERVICES` environment variable.
7979
8080
:param str iam_apikey: An API key that can be used to request IAM tokens. If
@@ -87,7 +87,7 @@ def __init__(
8787
made with an expired token will fail.
8888
8989
:param str iam_url: An optional URL for the IAM service API. Defaults to
90-
'https://iam.bluemix.net/identity/token'.
90+
'https://iam.cloud.ibm.com/identity/token'.
9191
"""
9292

9393
BaseService.__init__(

0 commit comments

Comments
 (0)