Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
af1e41e
Adding Generic Static VM
GilGald Aug 9, 2016
43abaaf
Changed is locked by default.
GilGald Aug 9, 2016
007871e
added vcenter app discovery
GilGald Aug 10, 2016
e5b1333
Adding Autoload.xml file
GilGald Aug 11, 2016
0423edb
-Removing the user inputs values.
GilGald Aug 11, 2016
3d13d04
updated ini file autoload static vm
GilGald Aug 11, 2016
cd96917
Creating driver ini
GilGald Aug 11, 2016
f8df60d
Merge branch 'feature/vm_static_add' into develop
GilGald Aug 25, 2016
88f1845
Merge branch 'develop' of https://github.com/QualiSystems/vCenterShel…
GilGald Aug 25, 2016
ae4bbfe
removed folder
GilGald Aug 25, 2016
22a3113
updating Travis .yaml file to run tests
GilGald Aug 25, 2016
8f3c4e5
Fixing YAML tests
GilGald Aug 25, 2016
6c18c65
check yaml breaking test
GilGald Aug 25, 2016
872e81d
undoing the tests
GilGald Aug 25, 2016
ec979b3
Changing the yaml
GilGald Aug 25, 2016
28796dc
yaml2
GilGald Aug 25, 2016
5e2aaf0
yaml3
GilGald Aug 25, 2016
41a8da5
yaml3
GilGald Aug 25, 2016
f504c93
t1
GilGald Aug 25, 2016
6aa27d8
t2
GilGald Aug 28, 2016
ab641cf
t3
GilGald Aug 28, 2016
985a4e2
t2
GilGald Aug 28, 2016
a7eea07
t3
GilGald Aug 28, 2016
8e24698
1
GilGald Aug 28, 2016
c9329a6
4
GilGald Aug 28, 2016
612b3e4
1
GilGald Aug 28, 2016
5308a77
1
GilGald Aug 28, 2016
d9d59b4
1
GilGald Aug 28, 2016
af59a8e
'
GilGald Aug 28, 2016
2d43109
s
GilGald Aug 28, 2016
9dc1332
d
GilGald Aug 28, 2016
247df2b
1
GilGald Aug 28, 2016
7f3ccf7
2
GilGald Aug 28, 2016
e45f107
q
GilGald Aug 28, 2016
69cbb0f
s
GilGald Aug 28, 2016
32da174
gt
GilGald Aug 28, 2016
bc59d6e
d
GilGald Aug 28, 2016
c96ca46
Running static VM and vCenter test
GilGald Aug 28, 2016
fdc6436
to py
GilGald Aug 28, 2016
f5ebeab
typo
GilGald Aug 29, 2016
a5e74cd
rt
GilGald Aug 29, 2016
01a7499
typo
GilGald Aug 29, 2016
91b1e3d
fail
GilGald Aug 29, 2016
6134dbf
fixing test_get_inventory
GilGald Aug 29, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
after_success: coveralls
env:
- CLOUD_SHELL_SHELL_CORE=1
- CLOUD_SHELL_SHELL_CORE=2
install:
- pip install -r external_requirements.txt
- pip install -r test_requirements.txt
- pip install "cloudshell-core>=2.0.0,<2.1.0" --extra-index-url https://testpypi.python.org/simple
- chmod 777 ./cloudshell_shell_core_install.sh
- ./cloudshell_shell_core_install.sh
- pip install "cloudshell-automation-api>=7.1.0.0,<7.2.0.0" --extra-index-url https://testpypi.python.org/simple
language: python
python:
- "2.7"

install:
- pip install -r external_requirements.txt
- pip install -r test_requirements.txt
- pip install "cloudshell-core>=2.0.0,<2.1.0" --extra-index-url https://testpypi.python.org/simple
- pip install "cloudshell-shell-core>=2.0.0,<2.1.0" --extra-index-url https://testpypi.python.org/simple
- pip install "cloudshell-automation-api>=7.1.0.0,<7.2.0.0" --extra-index-url https://testpypi.python.org/simple

script:
- pushd package
- python setup.py develop
- popd
- python runtests.py --with-coverage --cover-package=package --exclude-dir=integration

after_success:
coveralls

notifications:
webhools: https://qualisystems.getbadges.io/api/app/webhook/63350e33-4119-49c3-8127-075aaa022926
notifications:
webhools: "https://qualisystems.getbadges.io/api/app/webhook/63350e33-4119-49c3-8127-075aaa022926"
python:
- "2.7"
script:
- pushd package
- python setup.py develop
- popd
- chmod 777 ./run_static_or_vcenter_tests.sh
- ./run_static_or_vcenter_tests.sh
7 changes: 7 additions & 0 deletions cloudshell_shell_core_install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash
if [ "${CLOUD_SHELL_SHELL_CORE}" -eq 1 ]
then
pip install "cloudshell-shell-core>=2.0.0,<2.1.0" --extra-index-url https://testpypi.python.org/simple
else
pip install "cloudshell-shell-core>=2.4.0,<2.5.0" --extra-index-url https://testpypi.python.org/simple
fi
9 changes: 9 additions & 0 deletions run_static_or_vcenter_tests.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash
if [ "${CLOUD_SHELL_SHELL_CORE}" -eq 1 ]
then
echo "Running vCenter Tests"
python runtests.py --with-coverage --cover-package=package --exclude-dir=integration
else
echo "Running static VM Tests"
python runtestsStaticVM.py --with-coverage --cover-package=package --exclude-dir=integration
fi
9 changes: 9 additions & 0 deletions runtests.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
import re
import nose
import nose.config
import sys
from nose.plugins.manager import DefaultPluginManager
c = nose.config.Config()
c.plugins=DefaultPluginManager()
c.srcDirs = ['package']


# c.ignoreFiles.append('vm_autoload_driver')
c.ignoreFiles.append(re.compile(r'^vm_autoload_driver\.py$'))
c.ignoreFiles.append(re.compile(r'^test_get_inventory\.py$'))
c.ignoreFiles.append(re.compile(r'^DeployAppOrchestrationDriver$'))


if not nose.run(config=c):
sys.exit(1)
9 changes: 9 additions & 0 deletions runtestsStaticVM.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import nose
import nose.config
import sys
from nose.plugins.manager import DefaultPluginManager
c = nose.config.Config()
c.plugins=DefaultPluginManager()
c.srcDirs = ['static_vm_package']
if not nose.run(config=c):
sys.exit(1)
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ def test_get_inventory(self):
self.assertTrue(self.deploy_app_orchestration_driver._try_get_ip.called)
self.assertTrue(self.deploy_app_orchestration_driver._get_vm_details.called)
self.assertTrue(self.deploy_app_orchestration_driver.pv_service.find_vm_by_name.called)



def test_get_vm_details(self):
vm_details = self.deploy_app_orchestration_driver._get_vm_details(uuid="Piplup",
Expand All @@ -56,3 +58,4 @@ def test_get_vm_details(self):




6 changes: 6 additions & 0 deletions vCenterShell_specs/vcenter_app_discovery.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[Packaging]
is_driver: True
driver_folder: static_vm_autoload_driver
include_dirs:
target_name: VCenter Static VM Autoload
target_dir: Resource Drivers - Python