Added exception handling around adding security groups.

[snaps.git] / examples / demo.py

diff --git a/examples/demo.py b/examples/demo.py
index b2231f8..87c095b 100644 (file)
--- a/examples/demo.py
+++ b/examples/demo.py
@@ -1,22 +1,29 @@
 import logging
+
+from snaps.config.vm_inst import VmInstanceConfig
+
 logging.basicConfig(level=logging.INFO)
 
 # Credentials
 from snaps.openstack.os_credentials import OSCreds, ProxySettings
 
 
-proxy_settings = ProxySettings(host='10.197.123.27', port='3128',
-                               ssh_proxy_cmd='/usr/local/bin/corkscrew 10.197.123.27 3128 %h %p')
+proxy_settings = ProxySettings(
+    host='10.197.123.27', port='3128',
+    ssh_proxy_cmd='/usr/local/bin/corkscrew 10.197.123.27 3128 %h %p')
 
-os_creds = OSCreds(username='admin', password='cable123', auth_url='http://192.168.67.10:5000/v2.0/',
-                   project_name='admin', proxy_settings=proxy_settings)
+os_creds = OSCreds(
+    username='admin', password='cable123',
+    auth_url='http://192.168.67.10:5000/v2.0/', project_name='admin',
+    proxy_settings=proxy_settings)
 
 
 # Images
-from snaps.openstack.create_image import ImageSettings, OpenStackImage
+from snaps.openstack.create_image import OpenStackImage
+from snaps.config.image import ImageConfig
 
-image_settings = ImageSettings(name='cirros-test', image_user='cirros', img_format='qcow2',
-                               url='http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img')
+image_settings = ImageConfig(name='cirros-test', image_user='cirros', img_format='qcow2',
+                             url='http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img')
 
 image = OpenStackImage(os_creds, image_settings)
 image.create()
@@ -24,27 +31,33 @@ image.create()
 
 
 # Network
-from snaps.openstack.create_network import NetworkSettings, SubnetSettings, OpenStackNetwork
+from snaps.config.network import NetworkConfig, SubnetConfig
+from snaps.openstack.create_network import OpenStackNetwork
 
-subnet_settings = SubnetSettings(name='test-subnet', cidr='10.0.0.1/24')
-network_settings = NetworkSettings(name='test-net', subnet_settings=[subnet_settings])
+subnet_settings = SubnetConfig(name='test-subnet', cidr='10.0.0.1/24')
+network_settings = NetworkConfig(
+    name='test-net', subnet_settings=[subnet_settings])
 network = OpenStackNetwork(os_creds, network_settings)
 network.create()
 
 
 # Flavors
-from snaps.openstack.create_flavor import FlavorSettings, OpenStackFlavor
+from snaps.config.flavor import FlavorConfig
+from snaps.openstack.create_flavor import OpenStackFlavor
 
-flavor_settings = FlavorSettings(name='test-flavor', ram=128, disk=10, vcpus=2)
+flavor_settings = FlavorConfig(name='test-flavor', ram=256, disk=10, vcpus=2)
 flavor = OpenStackFlavor(os_creds, flavor_settings)
 flavor.create()
 
 # Instances
-from snaps.openstack.create_network import PortSettings
-from snaps.openstack.create_instance import VmInstanceSettings, OpenStackVmInstance
-
-port_settings = PortSettings(name='test-port', network_name=network_settings.name)
-instance_settings = VmInstanceSettings(name='test-inst', flavor=flavor_settings.name, port_settings=[port_settings])
+from snaps.config.network import PortConfig
+from snaps.openstack.create_instance import OpenStackVmInstance
+
+port_settings = PortConfig(
+    name='test-port', network_name=network_settings.name)
+instance_settings = VmInstanceConfig(
+    name='test-inst', flavor=flavor_settings.name,
+    port_settings=[port_settings])
 
 vm_inst = OpenStackVmInstance(os_creds, instance_settings, image_settings)
 vm_inst.create(block=True)