diff --git a/main.py b/main.py index c3f4013..c87fc3f 100644 --- a/main.py +++ b/main.py @@ -11,9 +11,9 @@ x.keystone.getCatalog() # print (x.keystone.catalogData) -neutronService=x.keystone.getServicebyName("Neutron") -print(neutronService) -neutronEndpointInternal=x.keystone.getEndpointByServiceIDAndInterface(neutronService['id'],"internal") +# neutronService=x.keystone.getServicebyName("Neutron") +# print(neutronService) +neutronEndpointInternal=x.keystone.getEndpointByNameIDAndInterface("NeuTrOn","internal") print(neutronEndpointInternal) # token = ng_openstack.auth.getToken(os.getenv("OS_USERNAME"), os.getenv("OS_PASSWORD"), diff --git a/ng_openstack/keystone.py b/ng_openstack/keystone.py index 91e0177..82b2e70 100644 --- a/ng_openstack/keystone.py +++ b/ng_openstack/keystone.py @@ -47,8 +47,16 @@ class Openstack_Keystone(): def getEndpointByServiceIDAndInterface(_self,id,interface): - for _endpoint in _self.catalogData['endpoints']: - if str(_endpoint['service_id']).lower()==str(id).lower(): - if str(_endpoint['interface']).lower()==str(interface).lower(): - # print(_endpoint) - return(_endpoint) \ No newline at end of file + for _endpoint in _self.catalogData['endpoints']: + if str(_endpoint['service_id']).lower()==str(id).lower(): + if str(_endpoint['interface']).lower()==str(interface).lower(): + # print(_endpoint) + return(_endpoint) + + def getEndpointByNameIDAndInterface(_self,name,interface): + serviceID=_self.getServicebyName(name)['id'] + for _endpoint in _self.catalogData['endpoints']: + if str(_endpoint['service_id']).lower()==str(id).lower(): + if str(_endpoint['interface']).lower()==str(interface).lower(): + # print(_endpoint) + return(_endpoint) \ No newline at end of file