Skip to content

changed driver_packager to work with ini file instead of cli args #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 6, 2016
Merged

changed driver_packager to work with ini file instead of cli args #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 12 additions & 13 deletions driver_packager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

DRIVER_FILE_NAME_FORMAT = 'vCenterShellPackage/Resource Scripts/{0}.zip'
STRIPING_CHARS = ' \t\n\r'
DRIVER_FOLDER = 'driver_folder'
INCLUDE_DIRS = 'include_dirs'
TARGET_NAME = 'target_name'
VERSION_FILENAME = 'version.txt'


Expand Down Expand Up @@ -39,26 +41,23 @@ def add_version_file_to_zip(ziph):

def main(args):
config_file_name = args[1]
driver = args[2]
target_name = args[3]
#driver = args[2]
#target_name = args[3]

print 'packing driver: {0}'.format(target_name)

with open('version.txt') as f_version:
if f_version is None:
raise Exception('no version file found')
version = f_version.read()
if not version:
raise Exception('no version file found')

with open(config_file_name) as f_config:
if f_config is None:
raise Exception('no packager config file found')
confing = dict()
config = dict()
config_raw = f_config.read().splitlines()
for att in config_raw:
cnf_att = att.split(':')
confing[cnf_att[0].strip(' \t\n\r')] = cnf_att[1].strip(STRIPING_CHARS).split(',')
config[cnf_att[0].strip(' \t\n\r')] = cnf_att[1].strip(STRIPING_CHARS).split(',')

target_name = config[TARGET_NAME][0]
driver = config[DRIVER_FOLDER][0]

print 'packing driver: {0}'.format(target_name)

zip_name = DRIVER_FILE_NAME_FORMAT.format(target_name)

Expand All @@ -76,7 +75,7 @@ def main(args):

add_version_file_to_zip(zip_file)

for dir_to_include in confing[INCLUDE_DIRS]:
for dir_to_include in config[INCLUDE_DIRS]:
zip_dir(dir_to_include, zip_file)

zip_file.close()
Expand Down
3 changes: 3 additions & 0 deletions packeger_configs/connect_command.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
driver_folder: vCenterShell
include_dirs: common,models,vCenterShell
target_name: Connect
3 changes: 3 additions & 0 deletions packeger_configs/deploy_from_template_command.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
driver_folder: vCenterShell
include_dirs: common,models,vCenterShell
target_name: Deploy From Template
3 changes: 3 additions & 0 deletions packeger_configs/deployment_service_driver.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
driver_folder: deployment_service
include_dirs: common,models,vCenterShell
target_name: Deploy
3 changes: 3 additions & 0 deletions packeger_configs/destroy_vm_command.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
driver_folder: vCenterShell
include_dirs: common,models,vCenterShell
target_name: Destroy VM
1 change: 0 additions & 1 deletion packeger_configs/packager_config_deployment_service_driver.txt
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion packeger_configs/packager_config_vCenterShell.txt
View file
Open in desktop

This file was deleted.

9 changes: 5 additions & 4 deletions run_packager.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

REM build driver scripts

python driver_packager.py packeger_configs\\packager_config_deployment_service_driver.txt deployment_service Deploy
python driver_packager.py packeger_configs\\packager_config_vCenterShell.txt vCenterShell "Deploy From Template"
python driver_packager.py packeger_configs\\packager_config_vCenterShell.txt vCenterShell "Destroy VM"
python driver_packager.py packeger_configs\\packager_config_vCenterShell.txt vCenterShell Connect
python driver_packager.py packeger_configs\\deployment_service_driver.ini
python driver_packager.py packeger_configs\\connect_command.ini
python driver_packager.py packeger_configs\\deploy_from_template_command.ini
python driver_packager.py packeger_configs\\destroy_vm_command.ini

copy orchestration_service\driver.py "vCenterShellPackage\\Resource Scripts\\Deploy App.py" /Y
copy vlan_service\vlan_driver.py "vCenterShellPackage\\Resource Scripts\\Connect All.py" /Y

Expand Down