Skip to content

Commit

Permalink
Update sevices in the mapper
Browse files Browse the repository at this point in the history
  • Loading branch information
gregocgt committed Jun 13, 2019
1 parent c28958b commit 6344fa8
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 26 deletions.
9 changes: 6 additions & 3 deletions README.md
Expand Up @@ -34,15 +34,15 @@ con = SOLIDserverRest("fqdn_host.org")
```

2. **Specify connection method**
Only native connection is supported for this version, using SSD default method
Only native connection is supported for this version, using SDS default method
and providing authentication through headers in the requests with information
encoded in base64

* user = user who want to use
* password = password of the user

```python
con.use_native_ssd(user="apiuser", password="apipwd")
con.use_native_sds(user="apiuser", password="apipwd")
```

3. **Request to SOLIDserver API**
Expand Down Expand Up @@ -79,5 +79,8 @@ Methods are organized to match the ontology used in SOLIDServer, you will find:

More information about supported methods in the [specific document](docs/METHODS.md)

## Supported SSD modules in methods are:
## Supported SDS modules in methods are:
-ip (IPAM - IP Address Management)
-dns (DNS - RR Management)
-app (Application Acces - GSLB Management)
-
63 changes: 42 additions & 21 deletions SOLIDserverRest/mapper.py
Expand Up @@ -14,82 +14,103 @@
'ip_site_update': 'ip_site_add',
'ip_site_count': 'ip_site_count',
'ip_site_list': 'ip_site_list',
'ip_site_read': 'ip_site_list',
'ip_site_info': 'ip_site_info',
'ip_site_delete': 'ip_site_delete',

'ip_subnet_add': 'ip_subnet_add',
'ip_subnet_create': 'ip_subnet_add',
'ip_subnet_update': 'ip_subnet_add',
'ip_subnet_count': 'ip_block_subnet_count',
'ip_subnet_list': 'ip_block_subnet_list',
'ip_subnet_read': 'ip_block_subnet_list',
'ip_subnet_info': 'ip_block_subnet_info',
'ip_subnet_delete': 'ip_subnet_delete',
'ip_subnet_find_free': 'ip_find_free_subnet',

'ip_subnet6_add': 'ip6_subnet6_add',
'ip_subnet6_create': 'ip6_subnet6_add',
'ip_subnet6_update': 'ip6_subnet6_add',
'ip_subnet6_count': 'ip6_block6_subnet6_count',
'ip_subnet6_list': 'ip6_block6_subnet6_list',
'ip_subnet6_read': 'ip6_block6_subnet6_list',
'ip_subnet6_info': 'ip6_block6_subnet6_info',
'ip_subnet6_delete': 'ip6_subnet6_delete',
'ip_subnet6_find_free': 'ip6_find_free_subnet6',

'ip_pool_add': 'ip_pool_add',
'ip_pool_create': 'ip_pool_add',
'ip_pool_update': 'ip_pool_add',
'ip_pool_count': 'ip_pool_count',
'ip_pool_list': 'ip_pool_list',
'ip_pool_read': 'ip_pool_list',
'ip_pool_info': 'ip_pool_info',
'ip_pool_delete': 'ip_pool_delete',

'ip_pool6_add': 'ip6_pool6_add',
'ip_pool6_create': 'ip6_pool6_add',
'ip_pool6_update': 'ip6_pool6_add',
'ip_pool6_count': 'ip6_pool6_count',
'ip_pool6_list': 'ip6_pool6_list',
'ip_pool6_read': 'ip6_pool6_list',
'ip_pool6_info': 'ip6_pool6_info',
'ip_pool6_delete': 'ip6_pool6_delete',

'ip_address_add': 'ip_add',
'ip_address_create': 'ip_add',
'ip_address_update': 'ip_add',
'ip_address_count': 'ip_address_count',
'ip_address_list': 'ip_address_list',
'ip_address_read': 'ip_address_list',
'ip_address_info': 'ip_address_info',
'ip_address_delete': 'ip_delete',
'ip_address_find_free': 'ip_find_free_address',

'ip_address6_add': 'ip6_address6_add',
'ip_address6_create': 'ip6_address6_add',
'ip_address6_update': 'ip6_address6_add',
'ip_address6_count': 'ip6_address6_count',
'ip_address6_list': 'ip6_address6_list',
'ip_address6_read': 'ip6_address6_list',
'ip_address6_info': 'ip6_address6_info',
'ip_address6_delete': 'ip6_address6_delete',
'ip_address6_find_free': 'ip6_find_free_address6',

'ip_alias_add': 'ip_alias_add',
'ip_alias_create': 'ip_alias_add',
'ip_alias_list': 'ip_alias_list',
'ip_alias_read': 'ip_alias_list',
'ip_alias_delete': 'ip_alias_delete',

'ip_alias6_add': 'ip6_alias_add',
'ip_alias6_create': 'ip6_alias_add',
'ip_alias6_list': 'ip6_alias_list',
'ip_alias6_read': 'ip6_alias_list',
'ip_alias6_delete': 'ip6_alias_delete',

'dns_rr_list': 'dns_rr_list',
'dns_rr_add': 'dns_rr_add',
'dns_rr_delete': 'dns_rr_delete',

'dns_server_list': 'dns_server_list',

'app_application_list': 'app_application_list',
'app_application_add': 'app_application_add',
'app_application_delete': 'app_application_delete',
'app_application_count': 'app_application_count',
'app_application_info': 'app_application_info',
'app_application_delete': 'app_application_delete',

'app_pool_add': 'app_pool_add',
'app_pool_update': 'app_pool_add',
'app_pool_list': 'app_pool_list',
'app_pool_count': 'app_pool_count',
'app_pool_info': 'app_pool_info',
'app_pool_delete': 'app_pool_delete',

'app_node_add': 'app_node_add',
'app_node_update': 'app_node_add',
'app_node_info': 'app_node_info',
'app_node_count': 'app_node_count',
'app_node_list': 'app_node_list',
'app_node_delete': 'app_node_delete',

'app_healthcheck_count': 'app_healthcheck_count',
'app_healthcheck_info': 'app_healthcheck_info',
'app_healthcheck_list': 'app_healthcheck_list',

}

METHOD_MAPPER = {
'add': 'POST',
'create': 'POST',
'update': 'PUT',
'count': 'GET',
'list': 'GET',
'read': 'GET',
'info': 'GET',
'delete': "DELETE",
'find_free': "OPTIONS",

'create': 'POST',
'delete': "DELETE",
}
4 changes: 2 additions & 2 deletions sample.py
Expand Up @@ -14,8 +14,8 @@
print('your_obj = SOLIDServerRest("host", "user", "password")')
con = SOLIDserverRest('192.168.56.254')
try:
con.useNativeSSD(user="api", password="admin")
except SSDInitError:
con.useNativeSDS(user="api", password="admin")
except SDSInitError:
exit()

print("-------------------")
Expand Down

0 comments on commit 6344fa8

Please sign in to comment.