Merge pull request #66 from cloudify-incubator/1.4.3

adding input args to vm

cloudify_azure/resources/compute/virtualmachine.py

@@ -180,13 +180,13 @@ def vm_name_generator():
 
 
 @operation
-def create(**_):
+def create(args=None, **_):
     '''Uses an existing, or creates a new, Virtual Machine'''
     # Generate a resource name (if needed)
     utils.generate_resource_name(
         VirtualMachine(),
         generator=vm_name_generator)
-    res_cfg = utils.get_resource_config() or dict()
+    res_cfg = utils.get_resource_config(args=args) or dict()
     # Build storage profile
     osdisk = build_osdisk_profile(
         res_cfg.get('storageProfile', dict()).get('osDisk', dict()))
@@ -237,7 +237,7 @@ def create(**_):
             'tags': ctx.node.properties.get('tags'),
             'plan': ctx.node.properties.get('plan'),
             'properties': utils.dict_update(
-                utils.get_resource_config(),
+                utils.get_resource_config(args=args),
                 {
                     'availabilitySet': utils.get_rel_id_reference(
                         AvailabilitySet,

cloudify_azure/utils.py

@@ -186,15 +186,15 @@ def task_resource_delete(resource, name=None, _ctx=ctx):
     resource.delete(name)
 
 
-def get_resource_config(_ctx=ctx):
+def get_resource_config(_ctx=ctx, args=None):
     '''
         Loads the resource config parameters and converts
         unicode key/value pairs for use with *requests*
 
     :returns: Resource config parameters
     :rtype: dict
     '''
-    return _ctx.node.properties.get('resource_config')
+    return args if args else _ctx.node.properties.get('resource_config')
 
 
 def get_resource_name_ref(rel, prop=None, _ctx=ctx):

plugin.yaml

@@ -5,9 +5,9 @@
 plugins:
   pkg:
     executor: central_deployment_agent
-    source: https://github.com/cloudify-cosmo/cloudify-azure-plugin/archive/master.zip
+    source: https://github.com/cloudify-cosmo/cloudify-azure-plugin/archive/1.4.3.zip
     package_name: cloudify-azure-plugin
-    package_version: '1.4.2'
+    package_version: '1.4.3'
 
 data_types:
   cloudify.datatypes.azure.Config:

setup.py

@@ -18,7 +18,7 @@
 
 setup(
     name='cloudify-azure-plugin',
-    version='1.4.2',
+    version='1.4.3',
     license='LICENSE',
     packages=[
         'cloudify_azure',