← Back to branch summary

~juju-qa/juju-ci-tools/trunk

~juju-qa/juju-ci-tools/trunk

« back to all changes in this revision

Viewing changes to jujucharm.py

Committer: Curtis Hovey
Date: 2017-01-25 02:32:29 UTC
mfrom: (1855 trunk)
mto: This revision was merged to the branch mainline in revision 1865.
Revision ID: curtis@canonical.com-20170125023229-g7c6bzt0cqe1j8g3

Merged trunk and resolved conflicts.

files added:
assess_model_change_watcher.py

assess_model_defaults.py

clean_lxd.py

jujupy

jujupy/__init__.py

jujupy/tests

jujupy/tests/__init__.py

jujupy/tests/test_version_client.py

jujupy/version_client.py

maas/add-existing-nodes-to-maas.sh

maas/reset-fabrics.bash

perfscale_controller_stress.py

prepare-testing.bash

requirements_py3.txt

tested-public-clouds/fpc-2016-12-14.yaml

tests/test_assess_model_defaults.py

tests/test_perfscale_controller_stress.py

files renamed:
assess_jes_deploy.py => assess_multimodel.py

jujupy.py => jujupy/client.py

fakejuju.py => jujupy/fake.py

tests/test_jujupy.py => jujupy/tests/test_client.py

tests/test_assess_jes_deploy.py => tests/test_assess_multimodel.py

files modified:
Makefile

assess_add_cloud.py

assess_autoload_credentials.py

assess_cloud.py

assess_constraints.py

assess_container_networking.py

assess_heterogeneous_control.py

assess_log_forward.py

assess_model_migration.py

assess_multi_series_charms.py

assess_public_clouds.py

assess_spaces_subnets.py

assess_unregister.py

assess_win_client.py

bootstrap

clean_maas.py

convert_config.py

deploy_stack.py

generate_perfscale_results.py

gotestwin.py

industrial_test.py

jujucharm.py

perfscale_longrunning.py

perfscale_mass_model_destruction.py

pipdeps.py

remote.py

run-osx-client-remote.bash

run-uitests.bash

streams-from-local.bash

substrate.py

test-restricted-network

tests/__init__.py

tests/test_assess_add_cloud.py

tests/test_assess_autoload_credentials.py

tests/test_assess_block.py

tests/test_assess_bootstrap.py

tests/test_assess_cloud.py

tests/test_assess_cloud_display.py

tests/test_assess_constraints.py

tests/test_assess_container_networking.py

tests/test_assess_controller_permissions.py

tests/test_assess_cs_staging.py

tests/test_assess_heterogeneous_control.py

tests/test_assess_log_rotation.py

tests/test_assess_mixed_images.py

tests/test_assess_model_config_tree.py

tests/test_assess_model_migration.py

tests/test_assess_proxy.py

tests/test_assess_public_clouds.py

tests/test_assess_recovery.py

tests/test_assess_spaces_subnets.py

tests/test_assess_ssh_keys.py

tests/test_assess_unregister.py

tests/test_assess_user_grant_revoke.py

tests/test_chaos.py

tests/test_deploy_stack.py

tests/test_generate_perfscale_results.py

tests/test_gotestwin.py

tests/test_industrial_test.py

tests/test_jujucharm.py

tests/test_jujuci.py

tests/test_perfscale_deployment.py

tests/test_perfscale_longrunning.py

tests/test_perfscale_mass_model_destruction.py

tests/test_pipdeps.py

tests/test_quickstart_deploy.py

tests/test_remote.py

tests/test_run_chaos_monkey.py

tests/test_run_deployer.py

tests/test_run_download_juju.py

tests/test_scale_out.py

tests/test_substrate.py

tests/test_verify_landscape_bundle.py

tests/test_verify_mediawiki_bundle.py

utility.py

write_industrial_test_metadata.py

Show diffs side-by-side

added added

removed removed

173

173

174

174

175

175

def sane_charm_store_api_url(url):

176

"""Ensure the store url includes the right parts."""

176

177

if url is None:

177

178

return CharmCommand.default_api_url

178

return '{}/charmstore'.format(re.sub('//(www\.)?', '//api.', url))

179

return '{}/charmstore'.format(url)

Older »