Merge branch 'develop'

# Conflicts:
#	deployment_drivers/deploy_clone_from_vm/requirements.txt
#	deployment_drivers/deploy_from_image/requirements.txt
#	deployment_drivers/deploy_from_linked_clone/requirements.txt
#	deployment_drivers/deploy_from_template/requirements.txt
#	vcentershell_driver/requirements.txt

Author: alexazarh

.gitignore

@@ -67,16 +67,14 @@ package/cloudshell/tests/config.ini
 *.tar.gz
 *.orig
 vCenterShell.zip
-vCenterShellPackage/Resource Drivers - Python/*
-vCenterShellPackage/Resource Scripts/*
-vCenterShellPackage/Topology Scripts/*.*
+vCenterShellPackage/
 debug.txt
 package/cloudshell/tests/utils/config.ini
-vCenterShellPackage/Resource Drivers - Python/VCenter Shell Driver.zip
 
 #IDE Helpers
 deployment.xml
 deployment
 
 #Misc
 .imdone
+develop.cmd

.travis.yml

@@ -3,13 +3,15 @@ python:
     - "2.7"
 
 install:
-    - pip install -r package/requirements.txt --extra-index-url https://testpypi.python.org/pypi
-    - pip install cloudshell-shell-core --extra-index-url https://testpypi.python.org/pypi
+    - pip install -r package/requirements.txt --extra-index-url https://testpypi.python.org/simple
+    - pip install cloudshell-shell-core --extra-index-url https://testpypi.python.org/simple
+    - pip install cloudshell-core --extra-index-url https://testpypi.python.org/simple
     - pip install -r test_requirements.txt
     - pip install coveralls
 
 script:
     - pushd package
+    - pip install "cloudshell-automation-api>=7.1.0.0,<7.2.0.0" --extra-index-url https://testpypi.python.org/simple
     - python setup.py develop
     - popd
     - python runtests.py --with-coverage  --cover-package=package --exclude-dir=integration

README.md

@@ -1,4 +1,6 @@
-[![Build Status](https://travis-ci.org/QualiSystems/vCenterShell.svg?branch=master)](https://travis-ci.org/QualiSystems/vCenterShell) [![Coverage Status](https://coveralls.io/repos/QualiSystems/vCenterShell/badge.svg?branch=develop&service=github)](https://coveralls.io/github/QualiSystems/vCenterShell?branch=develop) [![Code Climate](https://codeclimate.com/github/QualiSystems/vCenterShell/badges/gpa.svg)](https://codeclimate.com/github/QualiSystems/vCenterShell) [ ![Foo](https://qualisystems.getbadges.io/shield/company/qualisystems) ](https://getbadges.io) [![Stories in Ready](https://badge.waffle.io/QualiSystems/vCenterShell.svg?label=ready&title=Ready)](http://waffle.io/QualiSystems/vCenterShell) [![Join the chat at https://gitter.im/QualiSystems/vCenterShell](https://badges.gitter.im/QualiSystems/vCenterShell.svg)](https://gitter.im/QualiSystems/vCenterShell?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Analytics](https://ga-beacon.appspot.com/UA-72194260-1/QualiSystems/vCenterShell)](https://github.com/QualiSystems/vCenterShell/)
+[![Build Status](https://travis-ci.org/QualiSystems/vCenterShell.svg?branch=master)](https://travis-ci.org/QualiSystems/vCenterShell) [![Coverage Status](https://coveralls.io/repos/QualiSystems/vCenterShell/badge.svg?branch=develop&service=github)](https://coveralls.io/github/QualiSystems/vCenterShell?branch=develop) [![Code Climate](https://codeclimate.com/github/QualiSystems/vCenterShell/badges/gpa.svg)](https://codeclimate.com/github/QualiSystems/vCenterShell) 
+[![Dependency Status](https://dependencyci.com/github/QualiSystems/vCenterShell/badge)](https://dependencyci.com/github/QualiSystems/vCenterShell)
+[ ![Foo](https://qualisystems.getbadges.io/shield/company/qualisystems) ](https://getbadges.io) [![Stories in Ready](https://badge.waffle.io/QualiSystems/vCenterShell.svg?label=ready&title=Ready)](http://waffle.io/QualiSystems/vCenterShell) [![Join the chat at https://gitter.im/QualiSystems/vCenterShell](https://badges.gitter.im/QualiSystems/vCenterShell.svg)](https://gitter.im/QualiSystems/vCenterShell?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Analytics](https://ga-beacon.appspot.com/UA-72194260-1/QualiSystems/vCenterShell)](https://github.com/QualiSystems/vCenterShell/)
 
 A repository for projects providing out of the box capabilities within CloudShell to define VMWare vCenter instances in CloudShell and leverage vCenter's capabilities to deploy and connect apps in CloudShell sandboxes.
 

deployment_drivers/deploy_clone_from_vm/drivermetadata.xml

@@ -1,4 +1,4 @@
-<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.1.0">
+<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.3.0">
     <Layout>
         <Category Name="App Management">
             <Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />

deployment_drivers/deploy_clone_from_vm/requirements.txt

@@ -1,4 +1,4 @@
 jsonpickle==0.9.3
-cloudshell-automation-api>=7.0.0.0,<7.1.0.0
-cloudshell-cp-vcenter>=1.2.0,<1.3.0
+cloudshell-automation-api>=7.1.0.0,<7.2.0.0
+cloudshell-cp-vcenter>=1.3.0,<1.4.0
 cloudshell-shell-core>=2.0.0,<2.1.0

deployment_drivers/deploy_from_image/drivermetadata.xml

@@ -1,4 +1,4 @@
-<Driver Description="Deploy App From Image" MainClass="driver.DeployFromImage" Name="VM Deployment From Image" Version="1.1.0">
+<Driver Description="Deploy App From Image" MainClass="driver.DeployFromImage" Name="VM Deployment From Image" Version="1.3.0">
     <Layout>
         <Category Name="App Management">
             <Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />

deployment_drivers/deploy_from_image/requirements.txt

@@ -1,4 +1,4 @@
 jsonpickle==0.9.3
-cloudshell-automation-api>=7.0.0.0,<7.0.1.0
-cloudshell-cp-vcenter>=1.2.0,<1.3.0
+cloudshell-automation-api>=7.1.0.0,<7.2.0.0
+cloudshell-cp-vcenter>=1.3.0,<1.4.0
 cloudshell-shell-core>=2.0.0,<2.1.0

deployment_drivers/deploy_from_linked_clone/drivermetadata.xml

@@ -1,4 +1,4 @@
-<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.1.0">
+<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.3.0">
     <Layout>
         <Category Name="App Management">
             <Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />

deployment_drivers/deploy_from_linked_clone/requirements.txt

@@ -1,4 +1,4 @@
 jsonpickle==0.9.3
-cloudshell-automation-api>=7.0.0.0,<7.1.0.0
-cloudshell-cp-vcenter>=1.2.0,<1.3.0
+cloudshell-automation-api>=7.1.0.0,<7.2.0.0
+cloudshell-cp-vcenter>=1.3.0,<1.4.0
 cloudshell-shell-core>=2.0.0,<2.1.0

deployment_drivers/deploy_from_template/drivermetadata.xml

@@ -1,4 +1,4 @@
-<Driver Description="Deploy App From Template" MainClass="driver.DeployFromTemplateDriver" Name="VM Deployment From Template" Version="1.1.0">
+<Driver Description="Deploy App From Template" MainClass="driver.DeployFromTemplateDriver" Name="VM Deployment From Template" Version="1.3.0">
     <Layout>
         <Category Name="App Management">
             <Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />