Skip to content

Commit 559c914

Browse files
authored
Merge pull request #1222 from jyothisaroja/temp-branch
Make all keystone v3 services (ProjectService, RoleService,..) work
2 parents c347478 + 6af49fc commit 559c914

11 files changed

Lines changed: 38 additions & 20 deletions

File tree

core-test/src/main/resources/identity/v3/authv3_project.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,34 @@
537537
"id": "1236500210a24c38a1702e6825e12345",
538538
"name": "alarming"
539539
},
540+
{
541+
"endpoints": [
542+
{
543+
"region_id": "RegionOne",
544+
"url": "http://127.0.0.1:8087",
545+
"region": "RegionOne",
546+
"interface": "public",
547+
"id": "123458912d3f49a09df51035681d59a8"
548+
},
549+
{
550+
"region_id": "RegionOne",
551+
"url": "http://127.0.0.1:8087",
552+
"region": "RegionOne",
553+
"interface": "admin",
554+
"id": "123453dd1ae80457abc3728fa1e6f123"
555+
},
556+
{
557+
"region_id": "RegionOne",
558+
"url": "http://127.0.0.1:8087",
559+
"region": "RegionOne",
560+
"interface": "internal",
561+
"id": "123451a45a7040849c03bc1358854321"
562+
}
563+
],
564+
"type": "aodh",
565+
"id": "1236500210a24c38a1702e6825e12345",
566+
"name": "alarming"
567+
},
540568
{
541569
"endpoints": [
542570
{

core/src/main/java/org/openstack4j/openstack/identity/v3/internal/CredentialServiceImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
import org.openstack4j.model.identity.v3.Credential;
1111
import org.openstack4j.openstack.identity.v3.domain.KeystoneCredential;
1212
import org.openstack4j.openstack.identity.v3.domain.KeystoneCredential.Credentials;
13-
import org.openstack4j.openstack.internal.BaseOpenStackService;
1413

15-
public class CredentialServiceImpl extends BaseOpenStackService implements CredentialService {
14+
public class CredentialServiceImpl extends BaseIdentityServices implements CredentialService {
1615

1716
@Override
1817
public Credential create(Credential credential) {

core/src/main/java/org/openstack4j/openstack/identity/v3/internal/DomainServiceImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
import org.openstack4j.model.identity.v3.Domain;
1111
import org.openstack4j.openstack.identity.v3.domain.KeystoneDomain;
1212
import org.openstack4j.openstack.identity.v3.domain.KeystoneDomain.Domains;
13-
import org.openstack4j.openstack.internal.BaseOpenStackService;
1413

15-
public class DomainServiceImpl extends BaseOpenStackService implements DomainService {
14+
public class DomainServiceImpl extends BaseIdentityServices implements DomainService {
1615

1716
@Override
1817
public Domain create(Domain domain) {

core/src/main/java/org/openstack4j/openstack/identity/v3/internal/GroupServiceImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414
import org.openstack4j.openstack.identity.v3.domain.KeystoneGroup.Groups;
1515
import org.openstack4j.openstack.identity.v3.domain.KeystoneRole.Roles;
1616
import org.openstack4j.openstack.identity.v3.domain.KeystoneUser.Users;
17-
import org.openstack4j.openstack.internal.BaseOpenStackService;
1817

19-
public class GroupServiceImpl extends BaseOpenStackService implements GroupService {
18+
public class GroupServiceImpl extends BaseIdentityServices implements GroupService {
2019

2120
@Override
2221
public Group get(String groupId) {

core/src/main/java/org/openstack4j/openstack/identity/v3/internal/PolicyServiceImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
import org.openstack4j.model.identity.v3.Policy;
1111
import org.openstack4j.openstack.identity.v3.domain.KeystonePolicy;
1212
import org.openstack4j.openstack.identity.v3.domain.KeystonePolicy.Policies;
13-
import org.openstack4j.openstack.internal.BaseOpenStackService;
1413

15-
public class PolicyServiceImpl extends BaseOpenStackService implements PolicyService {
14+
public class PolicyServiceImpl extends BaseIdentityServices implements PolicyService {
1615

1716
@Override
1817
public Policy create(Policy policy) {

core/src/main/java/org/openstack4j/openstack/identity/v3/internal/ProjectServiceImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
import org.openstack4j.model.identity.v3.Project;
1111
import org.openstack4j.openstack.identity.v3.domain.KeystoneProject;
1212
import org.openstack4j.openstack.identity.v3.domain.KeystoneProject.Projects;
13-
import org.openstack4j.openstack.internal.BaseOpenStackService;
1413

15-
public class ProjectServiceImpl extends BaseOpenStackService implements ProjectService {
14+
public class ProjectServiceImpl extends BaseIdentityServices implements ProjectService {
1615

1716
@Override
1817
public Project create(Project project) {

core/src/main/java/org/openstack4j/openstack/identity/v3/internal/RegionServiceImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@
1010
import org.openstack4j.model.identity.v3.Region;
1111
import org.openstack4j.openstack.identity.v3.domain.KeystoneRegion;
1212
import org.openstack4j.openstack.identity.v3.domain.KeystoneRegion.Regions;
13-
import org.openstack4j.openstack.internal.BaseOpenStackService;
1413

1514
/**
1615
* Implementation of v3 region service
1716
*
1817
*/
19-
public class RegionServiceImpl extends BaseOpenStackService implements RegionService {
18+
public class RegionServiceImpl extends BaseIdentityServices implements RegionService {
2019

2120
@Override
2221
public Region create(Region region) {

core/src/main/java/org/openstack4j/openstack/identity/v3/internal/RoleServiceImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
import org.openstack4j.openstack.identity.v3.domain.KeystoneRole;
1313
import org.openstack4j.openstack.identity.v3.domain.KeystoneRole.Roles;
1414
import org.openstack4j.openstack.identity.v3.domain.KeystoneRoleAssignment.RoleAssignments;
15-
import org.openstack4j.openstack.internal.BaseOpenStackService;
1615

1716
/**
1817
* Identity Role based Operations Implementation
1918
*
2019
*/
21-
public class RoleServiceImpl extends BaseOpenStackService implements RoleService {
20+
public class RoleServiceImpl extends BaseIdentityServices implements RoleService {
2221

2322
/**
2423
* {@inheritDoc}

core/src/main/java/org/openstack4j/openstack/identity/v3/internal/ServiceEndpointServiceImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@
1616
import org.openstack4j.openstack.identity.v3.domain.KeystoneEndpoint.Endpoints;
1717
import org.openstack4j.openstack.identity.v3.domain.KeystoneService;
1818
import org.openstack4j.openstack.identity.v3.domain.KeystoneService.Services;
19-
import org.openstack4j.openstack.internal.BaseOpenStackService;
2019
/**
2120
*
2221
* implementation of v3 service manager service
2322
*
2423
*/
25-
public class ServiceEndpointServiceImpl extends BaseOpenStackService implements ServiceEndpointService {
24+
public class ServiceEndpointServiceImpl extends BaseIdentityServices implements ServiceEndpointService {
2625

2726
@Override
2827
public Service create(Service service) {

core/src/main/java/org/openstack4j/openstack/identity/v3/internal/TokenServiceImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@
1414
import org.openstack4j.openstack.identity.v3.domain.KeystoneProject.Projects;
1515
import org.openstack4j.openstack.identity.v3.domain.KeystoneService.Catalog;
1616
import org.openstack4j.openstack.identity.v3.domain.KeystoneToken;
17-
import org.openstack4j.openstack.internal.BaseOpenStackService;
1817

1918
import java.util.List;
2019

21-
public class TokenServiceImpl extends BaseOpenStackService implements TokenService {
20+
public class TokenServiceImpl extends BaseIdentityServices implements TokenService {
2221

2322
@Override
2423
public Token get(String tokenId) {

0 commit comments

Comments
 (0)