From d493f0a191f018a5ae3186107470891c7212c2ce Mon Sep 17 00:00:00 2001 From: lifeifei Date: Thu, 5 Dec 2019 16:04:03 +0800 Subject: [PATCH 1/3] Update README.md --- README.md | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 6313f5904..c28c5df48 100644 --- a/README.md +++ b/README.md @@ -219,12 +219,12 @@ The examples below are only a small fraction of the existing API so please refer ```java // Create a User associated to the new Project User user = os.identity().users().create(Builders.user() - .domainId("domain id") - .name("foobar") - .password("secret") - .email("foobar@example.com") - .enabled(true) - .build()); + .domainId("domain id") + .name("foobar") + .password("secret") + .email("foobar@example.com") + .enabled(true) + .build()); //or User user = os.identity().users().create("domain id", "foobar", "secret", "foobar@example.org", true); @@ -257,11 +257,11 @@ os.identity().roles().getByName("role name); ```java // Create a project os.identity().project().create(Builders.project() - .name("project name") - .description("project description") - .domainId("project domain id") - .enabled(true) - .build()); + .name("project name") + .description("project description") + .domainId("project domain id") + .enabled(true) + .build()); ``` #### Identity Operations (Keystone) V2 @@ -385,11 +385,10 @@ InputStream is = os.images().getAsStream("imageId"); // (URL Payload in this example, File, InputStream are other payloads available) Image image = os.images().create(Builders.image() .name("Cirros 0.3.0 x64") - .isPublic(true) - .containerFormat(ContainerFormat.BARE) - .diskFormat(DiskFormat.QCOW2) - .build() - ), Payloads.create(new URL("https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img"))); + .isPublic(true) + .containerFormat(ContainerFormat.BARE) + .diskFormat(DiskFormat.QCOW2) + .build()), Payloads.create(new URL("https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img"))); ``` License From 07683725baf61111005e75a01705995859dae3af Mon Sep 17 00:00:00 2001 From: lifeifei Date: Tue, 4 Feb 2020 15:36:04 +0800 Subject: [PATCH 2/3] Update README.md --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c28c5df48..c364ebd54 100644 --- a/README.md +++ b/README.md @@ -119,10 +119,10 @@ The legacy Identity V2 API now uses the class ```OSClientV2``` in place of the c ```java // Identity V2 Authentication Example OSClientV2 os = OSFactory.builderV2() - .endpoint("http://127.0.0.1:5000/v2.0") - .credentials("admin","sample") - .tenantName("admin") - .authenticate(); + .endpoint("http://127.0.0.1:5000/v2.0") + .credentials("admin","sample") + .tenantName("admin") + .authenticate(); ``` ##### Using Identity V3 authentication @@ -253,7 +253,6 @@ os.identity().roles().getByName("role name); ``` **Project operations** - ```java // Create a project os.identity().project().create(Builders.project() From de9209fce9dd0d622875d2e2a4cf143a38e67769 Mon Sep 17 00:00:00 2001 From: lifeifei Date: Wed, 19 Feb 2020 10:51:42 +0800 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 909d05701..2f9d4033f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -129,7 +129,7 @@ As a result we have added 2.0-maintenance branch which is the path to EOL for Op * Instead of the old version-mixed OSClient a OSClientV2 for only Identity V2 API and OSClientV3 for only Identity V3 API are available * Same refactoring for the OSClientSession: introducing new OSClientSessionV2 and OSClientV3 -### 2.20 +### 2.1.0 This marks the last of the 2.X OpenStack4j versioning scheme. Going forward only critical or specific pull requests will justify future release. It is strongly encourage to consider moving to OpenStack4j 3.0.X which offers the full Identity V3 Support.