diff options
| author |   spisarski <s.pisarski@cablelabs.com> | 2017-07-11 12:08:53 -0600 |
|---|---|---|
| committer | spisarski <s.pisarski@cablelabs.com> | 2017-07-11 12:54:46 -0600 |
| commit | 589f587b9139b84437d1b7e8cb017018fc9a4e06 (patch) | |
| tree | 3064f18ec710d09fa22daf133036d1607a979f7a /snaps/openstack/utils/nova_utils.py | |
| parent | 5f3fe6856f07bd1289bac532264eccf6cba68d77 (diff) | |
Created domain classes for security groups.
Created SecurityGroup and SecurityGroupRule classes so the neutron_utils
for security groups will be returning objects of these types instead of
the OpenStack objects returned by the API calls.
JIRA: SNAPS-116
Change-Id: I76ed1f85f7d54b984fc6f6ac28cee7680a1109e5
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/openstack/utils/nova_utils.py')
| -rw-r--r-- | snaps/openstack/utils/nova_utils.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/snaps/openstack/utils/nova_utils.py b/snaps/openstack/utils/nova_utils.py index db9a666..ccbf3c4 100644 --- a/snaps/openstack/utils/nova_utils.py +++ b/snaps/openstack/utils/nova_utils.py @@ -238,7 +238,8 @@ def keypair_exists(nova, keypair_obj): """ try: os_kp = nova.keypairs.get(keypair_obj) - return Keypair(name=os_kp.name, id=os_kp.id, public_key=os_kp.public_key) + return Keypair(name=os_kp.name, id=os_kp.id, + public_key=os_kp.public_key) except: return None @@ -414,10 +415,9 @@ def remove_security_group(nova, vm, security_group): Removes a security group from an existing VM :param nova: the nova client :param vm: the OpenStack server object (VM) to alter - :param security_group: the OpenStack security group object to add + :param security_group: the SNAPS SecurityGroup domain object to add """ - nova.servers.remove_security_group( - str(vm.id), security_group['security_group']['name']) + nova.servers.remove_security_group(str(vm.id), security_group.name) def add_floating_ip_to_server(nova, vm, floating_ip, ip_addr): |