Merge pull request #1222 from jyothisaroja/temp-branch

Make all keystone v3 services (ProjectService, RoleService,..) work
ContainX · Oct 18, 2018 · 559c914 · 559c914
2 parents c347478 + 6af49fc
commit 559c914
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 20 deletions.
diff --git a/core-test/src/main/resources/identity/v3/authv3_project.json b/core-test/src/main/resources/identity/v3/authv3_project.json
@@ -537,6 +537,34 @@
         "id": "1236500210a24c38a1702e6825e12345",
         "name": "alarming"
       },
+      {
+        "endpoints": [
+          {
+            "region_id": "RegionOne",
+            "url": "http://127.0.0.1:8087",
+            "region": "RegionOne",
+            "interface": "public",
+            "id": "123458912d3f49a09df51035681d59a8"
+          },
+          {
+            "region_id": "RegionOne",
+            "url": "http://127.0.0.1:8087",
+            "region": "RegionOne",
+            "interface": "admin",
+            "id": "123453dd1ae80457abc3728fa1e6f123"
+          },
+          {
+            "region_id": "RegionOne",
+            "url": "http://127.0.0.1:8087",
+            "region": "RegionOne",
+            "interface": "internal",
+            "id": "123451a45a7040849c03bc1358854321"
+          }
+        ],
+        "type": "aodh",
+        "id": "1236500210a24c38a1702e6825e12345",
+        "name": "alarming"
+      },
       {
         "endpoints": [
           {

diff --git a/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/CredentialServiceImpl.java b/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/CredentialServiceImpl.java
@@ -10,9 +10,8 @@
 import org.openstack4j.model.identity.v3.Credential;
 import org.openstack4j.openstack.identity.v3.domain.KeystoneCredential;
 import org.openstack4j.openstack.identity.v3.domain.KeystoneCredential.Credentials;
-import org.openstack4j.openstack.internal.BaseOpenStackService;
 
-public class CredentialServiceImpl extends BaseOpenStackService implements CredentialService {
+public class CredentialServiceImpl extends BaseIdentityServices implements CredentialService {
 
     @Override
     public Credential create(Credential credential) {

diff --git a/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/DomainServiceImpl.java b/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/DomainServiceImpl.java
@@ -10,9 +10,8 @@
 import org.openstack4j.model.identity.v3.Domain;
 import org.openstack4j.openstack.identity.v3.domain.KeystoneDomain;
 import org.openstack4j.openstack.identity.v3.domain.KeystoneDomain.Domains;
-import org.openstack4j.openstack.internal.BaseOpenStackService;
 
-public class DomainServiceImpl extends BaseOpenStackService implements DomainService {
+public class DomainServiceImpl extends BaseIdentityServices implements DomainService {
 
     @Override
     public Domain create(Domain domain) {

diff --git a/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/GroupServiceImpl.java b/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/GroupServiceImpl.java
@@ -14,9 +14,8 @@
 import org.openstack4j.openstack.identity.v3.domain.KeystoneGroup.Groups;
 import org.openstack4j.openstack.identity.v3.domain.KeystoneRole.Roles;
 import org.openstack4j.openstack.identity.v3.domain.KeystoneUser.Users;
-import org.openstack4j.openstack.internal.BaseOpenStackService;
 
-public class GroupServiceImpl extends BaseOpenStackService implements GroupService {
+public class GroupServiceImpl extends BaseIdentityServices implements GroupService {
 
     @Override
     public Group get(String groupId) {

diff --git a/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/PolicyServiceImpl.java b/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/PolicyServiceImpl.java
@@ -10,9 +10,8 @@
 import org.openstack4j.model.identity.v3.Policy;
 import org.openstack4j.openstack.identity.v3.domain.KeystonePolicy;
 import org.openstack4j.openstack.identity.v3.domain.KeystonePolicy.Policies;
-import org.openstack4j.openstack.internal.BaseOpenStackService;
 
-public class PolicyServiceImpl extends BaseOpenStackService implements PolicyService {
+public class PolicyServiceImpl extends BaseIdentityServices implements PolicyService {
 
     @Override
     public Policy create(Policy policy) {

diff --git a/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/ProjectServiceImpl.java b/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/ProjectServiceImpl.java
@@ -10,9 +10,8 @@
 import org.openstack4j.model.identity.v3.Project;
 import org.openstack4j.openstack.identity.v3.domain.KeystoneProject;
 import org.openstack4j.openstack.identity.v3.domain.KeystoneProject.Projects;
-import org.openstack4j.openstack.internal.BaseOpenStackService;
 
-public class ProjectServiceImpl extends BaseOpenStackService implements ProjectService  {
+public class ProjectServiceImpl extends BaseIdentityServices implements ProjectService  {
 
 	@Override
 	public Project create(Project project) {

diff --git a/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/RegionServiceImpl.java b/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/RegionServiceImpl.java
@@ -10,13 +10,12 @@
 import org.openstack4j.model.identity.v3.Region;
 import org.openstack4j.openstack.identity.v3.domain.KeystoneRegion;
 import org.openstack4j.openstack.identity.v3.domain.KeystoneRegion.Regions;
-import org.openstack4j.openstack.internal.BaseOpenStackService;
 
 /**
  * Implementation of v3 region service
  *
  */
-public class RegionServiceImpl extends BaseOpenStackService implements RegionService {
+public class RegionServiceImpl extends BaseIdentityServices implements RegionService {
 
     @Override
     public Region create(Region region) {

diff --git a/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/RoleServiceImpl.java b/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/RoleServiceImpl.java
@@ -12,13 +12,12 @@
 import org.openstack4j.openstack.identity.v3.domain.KeystoneRole;
 import org.openstack4j.openstack.identity.v3.domain.KeystoneRole.Roles;
 import org.openstack4j.openstack.identity.v3.domain.KeystoneRoleAssignment.RoleAssignments;
-import org.openstack4j.openstack.internal.BaseOpenStackService;
 
 /**
  * Identity Role based Operations Implementation
  *
  */
-public class RoleServiceImpl extends BaseOpenStackService implements RoleService {
+public class RoleServiceImpl extends BaseIdentityServices implements RoleService {
 
     /**
      * {@inheritDoc}

diff --git a/.../main/java/org/openstack4j/openstack/identity/v3/internal/ServiceEndpointServiceImpl.java b/.../main/java/org/openstack4j/openstack/identity/v3/internal/ServiceEndpointServiceImpl.java
@@ -16,13 +16,12 @@
 import org.openstack4j.openstack.identity.v3.domain.KeystoneEndpoint.Endpoints;
 import org.openstack4j.openstack.identity.v3.domain.KeystoneService;
 import org.openstack4j.openstack.identity.v3.domain.KeystoneService.Services;
-import org.openstack4j.openstack.internal.BaseOpenStackService;
 /**
  *
  * implementation of v3 service manager service
  *
  */
-public class ServiceEndpointServiceImpl extends BaseOpenStackService implements ServiceEndpointService {
+public class ServiceEndpointServiceImpl extends BaseIdentityServices implements ServiceEndpointService {
 
     @Override
     public Service create(Service service) {

diff --git a/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/TokenServiceImpl.java b/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/TokenServiceImpl.java
@@ -14,11 +14,10 @@
 import org.openstack4j.openstack.identity.v3.domain.KeystoneProject.Projects;
 import org.openstack4j.openstack.identity.v3.domain.KeystoneService.Catalog;
 import org.openstack4j.openstack.identity.v3.domain.KeystoneToken;
-import org.openstack4j.openstack.internal.BaseOpenStackService;
 
 import java.util.List;
 
-public class TokenServiceImpl extends BaseOpenStackService implements TokenService {
+public class TokenServiceImpl extends BaseIdentityServices implements TokenService {
 
     @Override
     public Token get(String tokenId) {

diff --git a/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/UserServiceImpl.java b/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/UserServiceImpl.java
@@ -22,13 +22,12 @@
 import org.openstack4j.openstack.identity.v3.domain.KeystoneRole.Roles;
 import org.openstack4j.openstack.identity.v3.domain.KeystoneUser;
 import org.openstack4j.openstack.identity.v3.domain.KeystoneUser.Users;
-import org.openstack4j.openstack.internal.BaseOpenStackService;
 
 /**
  * implementation of v3 user service
  *
  */
-public class UserServiceImpl extends BaseOpenStackService implements UserService {
+public class UserServiceImpl extends BaseIdentityServices implements UserService {
 
     /**
      * {@inheritDoc}