diff options
| -rw-r--r-- | deploy/post/execute.py | 24 | ||||
| -rw-r--r-- | deploy/post/neutron.py | 42 |
2 files changed, 59 insertions, 7 deletions
diff --git a/deploy/post/execute.py b/deploy/post/execute.py index 3f05d005..d5a0727b 100644 --- a/deploy/post/execute.py +++ b/deploy/post/execute.py @@ -25,9 +25,29 @@ def _config_admin_external_network(): return name, body +def _config_admin_external_subnet(nid): + return { + 'subnets': [ + { + 'name': 'admin_external_subnet', + 'cidr': '172.10.101.0/24', + 'ip_version': 4, + 'network_id': nid, + 'gateway_ip': '172.10.101.1', + 'allocation_pools': [{ + 'start': '172.10.101.2', + 'end': '172.10.101.12' + }], + 'enable_dhcp': False + } + ] + } + + def main(): - neutron.Neutron().list_networks() - neutron.Neutron().create_network(*(_config_admin_external_network())) + neutronclient = neutron.Neutron() + nid = neutronclient.create_network(*(_config_admin_external_network())) + neutronclient.create_subnet(_config_admin_external_subnet(nid)) if __name__ == '__main__': main() diff --git a/deploy/post/neutron.py b/deploy/post/neutron.py index 9c81ed24..e9cea8b0 100644 --- a/deploy/post/neutron.py +++ b/deploy/post/neutron.py @@ -16,19 +16,41 @@ class Neutron(object): session = keystoneauth.Keystoneauth(openrc).session self.client = neutronclient.Client(api_v, session=session) - def list_networks(self): - return self.client.list_networks()['networks'] - def create_network(self, name, body): if not self.is_network_exist(name): - self._create_network(name, body) + return self._create_network(name, body) else: print('admin_ext [{}] already exist'.format(name)) - pass + return None + + def create_subnet(self, body=None): + if not self.is_subnet_exist(body): + return self._create_subnet(body) + else: + print ('subnet [{}] already exist'.format(body)) + return None + + def list_networks(self): + return self.client.list_networks()['networks'] + + def list_subnets(self): + return self.client.list_subnets()['subnets'] def is_network_exist(self, name): return [] != filter(lambda n: n['name'] == name, self.list_networks()) + def is_subnet_exist(self, body): + print 'body: {}'.format(body) + + def same_subnet(n): + print 'n: {}'.format(n) + for item in ['name', 'network_id']: + if n[item] != body['subnets'][0][item]: + return False + return True + + return [] != filter(lambda n: same_subnet(n), self.list_subnets()) + def _create_network(self, name, body): try: nid = self.client.create_network(body=body)['network']['id'] @@ -37,3 +59,13 @@ class Neutron(object): except Exception, e: print('_create_admin_ext_net [{}] fail with: {}'.format(name, e)) return None + + def _create_subnet(self, body): + print('_create_subnet with body: {}'.format(body)) + try: + snid = self.client.create_subnet(body)['subnets'][0]['id'] + print('_create_subnet success with id={}'.format(snid)) + return snid + except Exception, e: + print('_create_subnet fail with: {}'.format(e)) + return None |