From 268e90854c4dd937543296a00ade56e901456210 Mon Sep 17 00:00:00 2001 From: Edan Binshtok Date: Wed, 18 Oct 2017 07:53:45 +0300 Subject: Align CI test test and JJB Add vendor agnostic CI test to align Add Tox and maven docker Issue Id: VVP-15 Change-Id: Ia84ba49b8d3631c1529c1a8141ebf2c2cb1881c9 Signed-off-by: Edan Binshtok --- .maven-dockerignore | 2 + Dockerfile | 0 LICENSE.TXT | 0 LICENSE.uWSGI | 0 django/README.md | 0 django/engagementmanager/__init__.py | 0 django/engagementmanager/admin.py | 0 django/engagementmanager/apps.py | 0 django/engagementmanager/bus/__init__.py | 0 django/engagementmanager/bus/handlers/__init__.py | 0 .../bus/handlers/activity_event_handler.py | 0 .../check_news_and_announcements_handler.py | 0 .../handlers/daily_notify_inactive_engagements.py | 0 .../daily_notify_inactive_engagements_handler.py | 0 .../handlers/daily_resend_notifications_handler.py | 0 .../handlers/digest_email_notification_handler.py | 0 .../bus/handlers/new_notification_handler.py | 0 .../bus/handlers/service_bus_base_handler.py | 0 django/engagementmanager/bus/messages/__init__.py | 0 .../bus/messages/activity_event_message.py | 0 .../bus/messages/daily_scheduled_message.py | 0 .../bus/messages/hourly_scheduled_message.py | 0 .../bus/messages/new_notification_message.py | 0 .../bus/messages/service_bus_base_message.py | 0 django/engagementmanager/cms_client/__init__.py | 0 django/engagementmanager/cms_client/api.py | 0 django/engagementmanager/decorator/__init__.py | 0 django/engagementmanager/decorator/auth.py | 0 .../engagementmanager/decorator/class_decorator.py | 0 .../engagementmanager/decorator/log_func_entry.py | 0 django/engagementmanager/decorator/retry.py | 0 django/engagementmanager/git/__init__.py | 0 django/engagementmanager/git/git_manager.py | 0 django/engagementmanager/http_client.py | 0 django/engagementmanager/mail.py | 0 django/engagementmanager/management/__init__.py | 0 .../management/commands/__init__.py | 0 .../management/commands/clean_gitlab_content.py | 0 .../management/commands/clean_jenkins_jobs.py | 0 .../management/commands/clean_vvp_db.py | 0 .../management/commands/clean_vvp_system.py | 0 .../management/commands/initial_populate_db.py | 0 ...opulate_all_gitlab_repo_and_user_and_jenkins.py | 0 .../management/commands/render_rgwa_credentials.py | 0 .../engagementmanager/migrations/0001_initial.py | 0 .../migrations/0001_squashed_initial.py | 3 +- .../migrations/0002_auto_20160704_1028.py | 0 .../migrations/0003_auto_20160713_0929.py | 0 .../migrations/0004_auto_20160720_2143.py | 0 .../migrations/0005_auto_20160815_1248.py | 0 .../migrations/0006_auto_20160825_0644.py | 0 .../migrations/0007_auto_20160922_0421.py | 0 .../migrations/0008_auto_20161009_1210.py | 0 .../migrations/0009_auto_20161018_0740.py | 0 .../migrations/0010_auto_20161025_0838.py | 0 .../migrations/0011_auto_20161109_0811.py | 0 .../migrations/0012_auto_20161109_0822.py | 0 .../migrations/0013_auto_20161128_1159.py | 0 .../migrations/0014_auto_20161129_1145.py | 0 .../migrations/0015_engagementstatus.py | 0 .../migrations/0016_auto_20161208_0842.py | 0 .../migrations/0017_auto_20161215_1535.py | 0 .../migrations/0018_set_old_notif_true.py | 0 .../migrations/0019_auto_20170104_1715.py | 0 .../migrations/0020_add_indexes_20170108.py | 0 ...rate_excel_overview_sheet_procedure_20170110.py | 0 .../migrations/0022_auto_20170118_1520.py | 0 .../migrations/0023_auto_20170123_1445.py | 0 .../migrations/0024_auto_20170227_1224.py | 0 .../0025_change_nextsteps_to_new_state.py | 0 .../0026_add_slack_handle_to_ice_user_profile.py | 0 .../migrations/0027_add_version_to_vf.py | 0 .../migrations/0028_auto_20170425_1310.py | 0 .../migrations/0029_auto_20170504_0749.py | 0 .../migrations/0030_engagement_archived_time.py | 0 .../migrations/0031_auto_20170620_1312.py | 0 .../migrations/0032_auto_20170702_1435.py | 0 .../migrations/0033_auto_20170704_0635.py | 0 .../migrations/0034_engagement_is_with_files.py | 0 .../migrations/0035_rgwa_fields.py | 0 .../migrations/0036_auto_20170906_0935.py | 0 django/engagementmanager/migrations/__init__.py | 0 django/engagementmanager/models.py | 0 django/engagementmanager/nextsteps.py | 0 django/engagementmanager/notifications.py | 0 django/engagementmanager/rest/__init__.py | 0 django/engagementmanager/rest/activation.py | 0 django/engagementmanager/rest/activity.py | 0 django/engagementmanager/rest/checklist.py | 0 .../engagementmanager/rest/checklist_audit_log.py | 0 .../engagementmanager/rest/checklist_decision.py | 0 .../engagementmanager/rest/checklist_set_state.py | 0 django/engagementmanager/rest/cms/__init__.py | 0 django/engagementmanager/rest/cms/pages.py | 0 django/engagementmanager/rest/cms/posts.py | 0 .../rest/csrf_exempt_session_authentication.py | 0 django/engagementmanager/rest/data_loader.py | 0 django/engagementmanager/rest/deployment_target.py | 0 .../rest/deployment_target_site.py | 0 django/engagementmanager/rest/ecomp.py | 0 django/engagementmanager/rest/engagement.py | 0 django/engagementmanager/rest/feedback.py | 0 django/engagementmanager/rest/invite.py | 0 django/engagementmanager/rest/login.py | 0 django/engagementmanager/rest/nextsteps.py | 0 django/engagementmanager/rest/notification.py | 0 django/engagementmanager/rest/parsers.py | 0 django/engagementmanager/rest/signup.py | 0 django/engagementmanager/rest/user.py | 0 .../engagementmanager/rest/validation_details.py | 0 django/engagementmanager/rest/vendor.py | 0 django/engagementmanager/rest/vf.py | 0 django/engagementmanager/rest/vfc.py | 0 django/engagementmanager/rest/vvp_api_view.py | 0 django/engagementmanager/scheduled_jobs.py | 0 django/engagementmanager/serializers.py | 0 django/engagementmanager/service/__init__.py | 0 .../service/activities_service.py | 0 .../service/authorization_service.py | 0 django/engagementmanager/service/base_service.py | 0 django/engagementmanager/service/bus_service.py | 0 .../service/checklist_audit_log_service.py | 0 .../service/checklist_decision_service.py | 0 .../engagementmanager/service/checklist_service.py | 0 .../service/checklist_state_service.py | 0 django/engagementmanager/service/cms/__init__.py | 0 django/engagementmanager/service/cms/base_cms.py | 0 .../engagementmanager/service/cms/pages_service.py | 0 .../engagementmanager/service/cms/posts_service.py | 0 .../service/deploment_target_service.py | 0 django/engagementmanager/service/ecomp_service.py | 0 .../service/engagement_service.py | 0 django/engagementmanager/service/invite_service.py | 0 .../engagementmanager/service/logging_service.py | 0 django/engagementmanager/service/login_service.py | 0 .../engagementmanager/service/nextstep_service.py | 0 django/engagementmanager/service/user_service.py | 0 django/engagementmanager/service/vf_service.py | 0 django/engagementmanager/service/vfc_service.py | 0 django/engagementmanager/slack_client/__init__.py | 0 django/engagementmanager/slack_client/api.py | 0 .../generate_excel_overview_sheet_procedure.sql | 0 django/engagementmanager/templatetags/__init__.py | 0 django/engagementmanager/templatetags/vvptags.py | 0 django/engagementmanager/tests/__init__.py | 0 .../tests/test_access_credentials.py | 0 django/engagementmanager/tests/test_activation.py | 0 django/engagementmanager/tests/test_activities.py | 0 django/engagementmanager/tests/test_add_contact.py | 0 .../engagementmanager/tests/test_add_feedback.py | 0 .../tests/test_add_next_step_to_checklist.py | 0 .../tests/test_audit_log_and_decision_api.py | 0 .../engagementmanager/tests/test_auth_service.py | 0 django/engagementmanager/tests/test_base_entity.py | 2 +- .../tests/test_base_transaction_entity.py | 2 +- django/engagementmanager/tests/test_checklist.py | 0 .../tests/test_checklist_template.py | 0 .../tests/test_cms_documentation_search.py | 0 django/engagementmanager/tests/test_cms_pages.py | 0 django/engagementmanager/tests/test_cms_posts.py | 0 .../tests/test_deployment_target_sites.py | 0 .../tests/test_digest_email_notifications.py | 0 .../engagementmanager/tests/test_eng_progress.py | 0 django/engagementmanager/tests/test_eng_status.py | 0 .../tests/test_engagement_admin_operations.py | 0 .../tests/test_engagement_export.py | 4 ++ .../engagementmanager/tests/test_expanded_eng.py | 0 .../tests/test_import_engagement_xls.py | 0 .../engagementmanager/tests/test_invite_members.py | 0 django/engagementmanager/tests/test_next_steps.py | 0 .../engagementmanager/tests/test_next_steps_api.py | 0 .../tests/test_notify_inactive_engagements.py | 0 .../tests/test_pull_notifications.py | 0 .../engagementmanager/tests/test_rados_gateway.py | 0 .../tests/test_remove_user_from_eng_team.py | 0 .../tests/test_request_data_manager.py | 4 +- .../tests/test_resend_activation_email.py | 0 .../engagementmanager/tests/test_reset_password.py | 0 django/engagementmanager/tests/test_rgwa_client.py | 0 .../tests/test_set_checklist_state.py | 27 ++++---- .../engagementmanager/tests/test_set_eng_stage.py | 0 .../tests/test_update_password.py | 0 .../tests/test_update_user_account.py | 0 django/engagementmanager/tests/test_vfc.py | 0 .../engagementmanager/tests/vvpEntitiesCreator.py | 0 django/engagementmanager/urls.py | 0 django/engagementmanager/utils/__init__.py | 0 django/engagementmanager/utils/activities_data.py | 0 django/engagementmanager/utils/authentication.py | 0 django/engagementmanager/utils/choice_enum.py | 0 django/engagementmanager/utils/constants.py | 10 +-- django/engagementmanager/utils/cryptography.py | 0 django/engagementmanager/utils/dates.py | 0 .../engagementmanager/utils/exception_handler.py | 0 .../utils/exception_message_factory.py | 0 django/engagementmanager/utils/request_data_mgr.py | 0 django/engagementmanager/utils/validator.py | 0 django/engagementmanager/utils/vvp_exceptions.py | 0 django/engagementmanager/views_helper.py | 0 .../engagementmanager/vm_integration/__init__.py | 0 django/engagementmanager/vm_integration/em_api.py | 0 .../engagementmanager/vm_integration/vm_client.py | 0 django/manage.py | 0 django/mocks/__init__.py | 0 django/mocks/gitlab_mock/__init__.py | 0 django/mocks/gitlab_mock/rest/__init__.py | 0 .../gitlab_mock/rest/gitlab_files_respons_rest.py | 0 django/mocks/gitlab_mock/services/__init__.py | 0 .../gitlab_mock/services/gitlab_files_service.py | 0 django/mocks/jenkins_mock/__init__.py | 0 django/mocks/jenkins_mock/rest/__init__.py | 0 .../rest/jenkins_tests_validation_rest.py | 0 django/mocks/jenkins_mock/services/__init__.py | 0 .../services/jenkins_tests_validation_service.py | 0 django/requirements.txt | 0 django/rgwa_mock/__init__.py | 0 django/rgwa_mock/services/__init__.py | 0 django/rgwa_mock/services/rgwa_keys_service.py | 0 django/tools/__init__.py | 0 django/tox.ini | 15 ++--- django/validationmanager/__init__.py | 0 django/validationmanager/admin.py | 0 django/validationmanager/apps.py | 0 .../validationmanager/em_integration/__init__.py | 0 .../validationmanager/em_integration/em_client.py | 0 django/validationmanager/em_integration/vm_api.py | 0 django/validationmanager/git/__init__.py | 0 django/validationmanager/git/gitlab_client.py | 0 django/validationmanager/jenkins/__init__.py | 0 django/validationmanager/jenkins/jenkins_client.py | 0 .../validationmanager/migrations/0001_initial.py | 0 .../migrations/0002_auto_20161019_2056.py | 0 .../migrations/0003_auto_20170423_0531.py | 0 django/validationmanager/migrations/__init__.py | 0 django/validationmanager/models.py | 0 django/validationmanager/rados/__init__.py | 0 django/validationmanager/rados/rgwa_client.py | 0 .../validationmanager/rados/rgwa_client_factory.py | 0 django/validationmanager/rest/__init__.py | 0 .../validationmanager/rest/git_webhook_endpoint.py | 0 .../validationmanager/rest/http_response_custom.py | 0 .../rest/jenkins_webhook_endpoint.py | 0 .../templates/jenkins_job_config.xml | 38 ----------- django/validationmanager/tests/__init__.py | 0 .../validationmanager/tests/testFinishedSignal.py | 0 django/validationmanager/tests/test_git_push.py | 0 .../tests/test_rgwa_client_factory.py | 0 django/validationmanager/urls.py | 0 django/validationmanager/utils/__init__.py | 0 django/validationmanager/utils/clients.py | 0 django/validationmanager/utils/constants.py | 0 .../validationmanager/utils/keyawaredefaultdict.py | 0 django/vvp/__init__.py | 0 django/vvp/settings/logs/vvp-db.log | 0 django/vvp/settings/logs/vvp-debug.log | 0 django/vvp/settings/logs/vvp-info.log | 0 django/vvp/settings/logs/vvp-requests.log | 0 django/vvp/settings/tox_settings.py | 22 ++++--- django/vvp/urls.py | 0 django/vvp/wsgi.py | 0 django/web/templates/admin/base.html | 75 +++++++++++----------- django/web/templates/admin/base_site.html | 75 +++++++++++----------- django/web/templates/admin/login.html | 75 +++++++++++----------- .../emails/activate/activate_mail_body.html | 75 +++++++++++----------- .../emails/activate/activate_mail_subject.html | 40 +----------- .../templates/emails/invite/invite_mail_body.html | 75 +++++++++++----------- .../emails/invite/invite_mail_subject.html | 40 +----------- .../notification_digest_mail_body.html | 75 +++++++++++----------- .../notification_digest_mail_subject.html | 40 +----------- .../notification/notification_mail_body.html | 75 +++++++++++----------- .../notification/notification_mail_subject.html | 40 +----------- .../reset_pwd_instructions_mail_body.html | 75 +++++++++++----------- .../reset_pwd_instructions_mail_subject.html | 40 +----------- pom.xml | 0 tox.ini | 49 ++++++++++++++ 275 files changed, 400 insertions(+), 578 deletions(-) create mode 100644 .maven-dockerignore mode change 100755 => 100644 Dockerfile mode change 100755 => 100644 LICENSE.TXT mode change 100755 => 100644 LICENSE.uWSGI mode change 100755 => 100644 django/README.md mode change 100755 => 100644 django/engagementmanager/__init__.py mode change 100755 => 100644 django/engagementmanager/admin.py mode change 100755 => 100644 django/engagementmanager/apps.py mode change 100755 => 100644 django/engagementmanager/bus/__init__.py mode change 100755 => 100644 django/engagementmanager/bus/handlers/__init__.py mode change 100755 => 100644 django/engagementmanager/bus/handlers/activity_event_handler.py mode change 100755 => 100644 django/engagementmanager/bus/handlers/check_news_and_announcements_handler.py mode change 100755 => 100644 django/engagementmanager/bus/handlers/daily_notify_inactive_engagements.py mode change 100755 => 100644 django/engagementmanager/bus/handlers/daily_notify_inactive_engagements_handler.py mode change 100755 => 100644 django/engagementmanager/bus/handlers/daily_resend_notifications_handler.py mode change 100755 => 100644 django/engagementmanager/bus/handlers/digest_email_notification_handler.py mode change 100755 => 100644 django/engagementmanager/bus/handlers/new_notification_handler.py mode change 100755 => 100644 django/engagementmanager/bus/handlers/service_bus_base_handler.py mode change 100755 => 100644 django/engagementmanager/bus/messages/__init__.py mode change 100755 => 100644 django/engagementmanager/bus/messages/activity_event_message.py mode change 100755 => 100644 django/engagementmanager/bus/messages/daily_scheduled_message.py mode change 100755 => 100644 django/engagementmanager/bus/messages/hourly_scheduled_message.py mode change 100755 => 100644 django/engagementmanager/bus/messages/new_notification_message.py mode change 100755 => 100644 django/engagementmanager/bus/messages/service_bus_base_message.py mode change 100755 => 100644 django/engagementmanager/cms_client/__init__.py mode change 100755 => 100644 django/engagementmanager/cms_client/api.py mode change 100755 => 100644 django/engagementmanager/decorator/__init__.py mode change 100755 => 100644 django/engagementmanager/decorator/auth.py mode change 100755 => 100644 django/engagementmanager/decorator/class_decorator.py mode change 100755 => 100644 django/engagementmanager/decorator/log_func_entry.py mode change 100755 => 100644 django/engagementmanager/decorator/retry.py mode change 100755 => 100644 django/engagementmanager/git/__init__.py mode change 100755 => 100644 django/engagementmanager/git/git_manager.py mode change 100755 => 100644 django/engagementmanager/http_client.py mode change 100755 => 100644 django/engagementmanager/mail.py mode change 100755 => 100644 django/engagementmanager/management/__init__.py mode change 100755 => 100644 django/engagementmanager/management/commands/__init__.py mode change 100755 => 100644 django/engagementmanager/management/commands/clean_gitlab_content.py mode change 100755 => 100644 django/engagementmanager/management/commands/clean_jenkins_jobs.py mode change 100755 => 100644 django/engagementmanager/management/commands/clean_vvp_db.py mode change 100755 => 100644 django/engagementmanager/management/commands/clean_vvp_system.py mode change 100755 => 100644 django/engagementmanager/management/commands/initial_populate_db.py mode change 100755 => 100644 django/engagementmanager/management/commands/populate_all_gitlab_repo_and_user_and_jenkins.py mode change 100755 => 100644 django/engagementmanager/management/commands/render_rgwa_credentials.py mode change 100755 => 100644 django/engagementmanager/migrations/0001_initial.py mode change 100755 => 100644 django/engagementmanager/migrations/0001_squashed_initial.py mode change 100755 => 100644 django/engagementmanager/migrations/0002_auto_20160704_1028.py mode change 100755 => 100644 django/engagementmanager/migrations/0003_auto_20160713_0929.py mode change 100755 => 100644 django/engagementmanager/migrations/0004_auto_20160720_2143.py mode change 100755 => 100644 django/engagementmanager/migrations/0005_auto_20160815_1248.py mode change 100755 => 100644 django/engagementmanager/migrations/0006_auto_20160825_0644.py mode change 100755 => 100644 django/engagementmanager/migrations/0007_auto_20160922_0421.py mode change 100755 => 100644 django/engagementmanager/migrations/0008_auto_20161009_1210.py mode change 100755 => 100644 django/engagementmanager/migrations/0009_auto_20161018_0740.py mode change 100755 => 100644 django/engagementmanager/migrations/0010_auto_20161025_0838.py mode change 100755 => 100644 django/engagementmanager/migrations/0011_auto_20161109_0811.py mode change 100755 => 100644 django/engagementmanager/migrations/0012_auto_20161109_0822.py mode change 100755 => 100644 django/engagementmanager/migrations/0013_auto_20161128_1159.py mode change 100755 => 100644 django/engagementmanager/migrations/0014_auto_20161129_1145.py mode change 100755 => 100644 django/engagementmanager/migrations/0015_engagementstatus.py mode change 100755 => 100644 django/engagementmanager/migrations/0016_auto_20161208_0842.py mode change 100755 => 100644 django/engagementmanager/migrations/0017_auto_20161215_1535.py mode change 100755 => 100644 django/engagementmanager/migrations/0018_set_old_notif_true.py mode change 100755 => 100644 django/engagementmanager/migrations/0019_auto_20170104_1715.py mode change 100755 => 100644 django/engagementmanager/migrations/0020_add_indexes_20170108.py mode change 100755 => 100644 django/engagementmanager/migrations/0021_generate_excel_overview_sheet_procedure_20170110.py mode change 100755 => 100644 django/engagementmanager/migrations/0022_auto_20170118_1520.py mode change 100755 => 100644 django/engagementmanager/migrations/0023_auto_20170123_1445.py mode change 100755 => 100644 django/engagementmanager/migrations/0024_auto_20170227_1224.py mode change 100755 => 100644 django/engagementmanager/migrations/0025_change_nextsteps_to_new_state.py mode change 100755 => 100644 django/engagementmanager/migrations/0026_add_slack_handle_to_ice_user_profile.py mode change 100755 => 100644 django/engagementmanager/migrations/0027_add_version_to_vf.py mode change 100755 => 100644 django/engagementmanager/migrations/0028_auto_20170425_1310.py mode change 100755 => 100644 django/engagementmanager/migrations/0029_auto_20170504_0749.py mode change 100755 => 100644 django/engagementmanager/migrations/0030_engagement_archived_time.py mode change 100755 => 100644 django/engagementmanager/migrations/0031_auto_20170620_1312.py mode change 100755 => 100644 django/engagementmanager/migrations/0032_auto_20170702_1435.py mode change 100755 => 100644 django/engagementmanager/migrations/0033_auto_20170704_0635.py mode change 100755 => 100644 django/engagementmanager/migrations/0034_engagement_is_with_files.py mode change 100755 => 100644 django/engagementmanager/migrations/0035_rgwa_fields.py mode change 100755 => 100644 django/engagementmanager/migrations/0036_auto_20170906_0935.py mode change 100755 => 100644 django/engagementmanager/migrations/__init__.py mode change 100755 => 100644 django/engagementmanager/models.py mode change 100755 => 100644 django/engagementmanager/nextsteps.py mode change 100755 => 100644 django/engagementmanager/notifications.py mode change 100755 => 100644 django/engagementmanager/rest/__init__.py mode change 100755 => 100644 django/engagementmanager/rest/activation.py mode change 100755 => 100644 django/engagementmanager/rest/activity.py mode change 100755 => 100644 django/engagementmanager/rest/checklist.py mode change 100755 => 100644 django/engagementmanager/rest/checklist_audit_log.py mode change 100755 => 100644 django/engagementmanager/rest/checklist_decision.py mode change 100755 => 100644 django/engagementmanager/rest/checklist_set_state.py mode change 100755 => 100644 django/engagementmanager/rest/cms/__init__.py mode change 100755 => 100644 django/engagementmanager/rest/cms/pages.py mode change 100755 => 100644 django/engagementmanager/rest/cms/posts.py mode change 100755 => 100644 django/engagementmanager/rest/csrf_exempt_session_authentication.py mode change 100755 => 100644 django/engagementmanager/rest/data_loader.py mode change 100755 => 100644 django/engagementmanager/rest/deployment_target.py mode change 100755 => 100644 django/engagementmanager/rest/deployment_target_site.py mode change 100755 => 100644 django/engagementmanager/rest/ecomp.py mode change 100755 => 100644 django/engagementmanager/rest/engagement.py mode change 100755 => 100644 django/engagementmanager/rest/feedback.py mode change 100755 => 100644 django/engagementmanager/rest/invite.py mode change 100755 => 100644 django/engagementmanager/rest/login.py mode change 100755 => 100644 django/engagementmanager/rest/nextsteps.py mode change 100755 => 100644 django/engagementmanager/rest/notification.py mode change 100755 => 100644 django/engagementmanager/rest/parsers.py mode change 100755 => 100644 django/engagementmanager/rest/signup.py mode change 100755 => 100644 django/engagementmanager/rest/user.py mode change 100755 => 100644 django/engagementmanager/rest/validation_details.py mode change 100755 => 100644 django/engagementmanager/rest/vendor.py mode change 100755 => 100644 django/engagementmanager/rest/vf.py mode change 100755 => 100644 django/engagementmanager/rest/vfc.py mode change 100755 => 100644 django/engagementmanager/rest/vvp_api_view.py mode change 100755 => 100644 django/engagementmanager/scheduled_jobs.py mode change 100755 => 100644 django/engagementmanager/serializers.py mode change 100755 => 100644 django/engagementmanager/service/__init__.py mode change 100755 => 100644 django/engagementmanager/service/activities_service.py mode change 100755 => 100644 django/engagementmanager/service/authorization_service.py mode change 100755 => 100644 django/engagementmanager/service/base_service.py mode change 100755 => 100644 django/engagementmanager/service/bus_service.py mode change 100755 => 100644 django/engagementmanager/service/checklist_audit_log_service.py mode change 100755 => 100644 django/engagementmanager/service/checklist_decision_service.py mode change 100755 => 100644 django/engagementmanager/service/checklist_service.py mode change 100755 => 100644 django/engagementmanager/service/checklist_state_service.py mode change 100755 => 100644 django/engagementmanager/service/cms/__init__.py mode change 100755 => 100644 django/engagementmanager/service/cms/base_cms.py mode change 100755 => 100644 django/engagementmanager/service/cms/pages_service.py mode change 100755 => 100644 django/engagementmanager/service/cms/posts_service.py mode change 100755 => 100644 django/engagementmanager/service/deploment_target_service.py mode change 100755 => 100644 django/engagementmanager/service/ecomp_service.py mode change 100755 => 100644 django/engagementmanager/service/engagement_service.py mode change 100755 => 100644 django/engagementmanager/service/invite_service.py mode change 100755 => 100644 django/engagementmanager/service/logging_service.py mode change 100755 => 100644 django/engagementmanager/service/login_service.py mode change 100755 => 100644 django/engagementmanager/service/nextstep_service.py mode change 100755 => 100644 django/engagementmanager/service/user_service.py mode change 100755 => 100644 django/engagementmanager/service/vf_service.py mode change 100755 => 100644 django/engagementmanager/service/vfc_service.py mode change 100755 => 100644 django/engagementmanager/slack_client/__init__.py mode change 100755 => 100644 django/engagementmanager/slack_client/api.py mode change 100755 => 100644 django/engagementmanager/sql-scripts/generate_excel_overview_sheet_procedure.sql mode change 100755 => 100644 django/engagementmanager/templatetags/__init__.py mode change 100755 => 100644 django/engagementmanager/templatetags/vvptags.py mode change 100755 => 100644 django/engagementmanager/tests/__init__.py mode change 100755 => 100644 django/engagementmanager/tests/test_access_credentials.py mode change 100755 => 100644 django/engagementmanager/tests/test_activation.py mode change 100755 => 100644 django/engagementmanager/tests/test_activities.py mode change 100755 => 100644 django/engagementmanager/tests/test_add_contact.py mode change 100755 => 100644 django/engagementmanager/tests/test_add_feedback.py mode change 100755 => 100644 django/engagementmanager/tests/test_add_next_step_to_checklist.py mode change 100755 => 100644 django/engagementmanager/tests/test_audit_log_and_decision_api.py mode change 100755 => 100644 django/engagementmanager/tests/test_auth_service.py mode change 100755 => 100644 django/engagementmanager/tests/test_base_entity.py mode change 100755 => 100644 django/engagementmanager/tests/test_base_transaction_entity.py mode change 100755 => 100644 django/engagementmanager/tests/test_checklist.py mode change 100755 => 100644 django/engagementmanager/tests/test_checklist_template.py mode change 100755 => 100644 django/engagementmanager/tests/test_cms_documentation_search.py mode change 100755 => 100644 django/engagementmanager/tests/test_cms_pages.py mode change 100755 => 100644 django/engagementmanager/tests/test_cms_posts.py mode change 100755 => 100644 django/engagementmanager/tests/test_deployment_target_sites.py mode change 100755 => 100644 django/engagementmanager/tests/test_digest_email_notifications.py mode change 100755 => 100644 django/engagementmanager/tests/test_eng_progress.py mode change 100755 => 100644 django/engagementmanager/tests/test_eng_status.py mode change 100755 => 100644 django/engagementmanager/tests/test_engagement_admin_operations.py mode change 100755 => 100644 django/engagementmanager/tests/test_engagement_export.py mode change 100755 => 100644 django/engagementmanager/tests/test_expanded_eng.py mode change 100755 => 100644 django/engagementmanager/tests/test_import_engagement_xls.py mode change 100755 => 100644 django/engagementmanager/tests/test_invite_members.py mode change 100755 => 100644 django/engagementmanager/tests/test_next_steps.py mode change 100755 => 100644 django/engagementmanager/tests/test_next_steps_api.py mode change 100755 => 100644 django/engagementmanager/tests/test_notify_inactive_engagements.py mode change 100755 => 100644 django/engagementmanager/tests/test_pull_notifications.py mode change 100755 => 100644 django/engagementmanager/tests/test_rados_gateway.py mode change 100755 => 100644 django/engagementmanager/tests/test_remove_user_from_eng_team.py mode change 100755 => 100644 django/engagementmanager/tests/test_request_data_manager.py mode change 100755 => 100644 django/engagementmanager/tests/test_resend_activation_email.py mode change 100755 => 100644 django/engagementmanager/tests/test_reset_password.py mode change 100755 => 100644 django/engagementmanager/tests/test_rgwa_client.py mode change 100755 => 100644 django/engagementmanager/tests/test_set_checklist_state.py mode change 100755 => 100644 django/engagementmanager/tests/test_set_eng_stage.py mode change 100755 => 100644 django/engagementmanager/tests/test_update_password.py mode change 100755 => 100644 django/engagementmanager/tests/test_update_user_account.py mode change 100755 => 100644 django/engagementmanager/tests/test_vfc.py mode change 100755 => 100644 django/engagementmanager/tests/vvpEntitiesCreator.py mode change 100755 => 100644 django/engagementmanager/urls.py mode change 100755 => 100644 django/engagementmanager/utils/__init__.py mode change 100755 => 100644 django/engagementmanager/utils/activities_data.py mode change 100755 => 100644 django/engagementmanager/utils/authentication.py mode change 100755 => 100644 django/engagementmanager/utils/choice_enum.py mode change 100755 => 100644 django/engagementmanager/utils/constants.py mode change 100755 => 100644 django/engagementmanager/utils/cryptography.py mode change 100755 => 100644 django/engagementmanager/utils/dates.py mode change 100755 => 100644 django/engagementmanager/utils/exception_handler.py mode change 100755 => 100644 django/engagementmanager/utils/exception_message_factory.py mode change 100755 => 100644 django/engagementmanager/utils/request_data_mgr.py mode change 100755 => 100644 django/engagementmanager/utils/validator.py mode change 100755 => 100644 django/engagementmanager/utils/vvp_exceptions.py mode change 100755 => 100644 django/engagementmanager/views_helper.py mode change 100755 => 100644 django/engagementmanager/vm_integration/__init__.py mode change 100755 => 100644 django/engagementmanager/vm_integration/em_api.py mode change 100755 => 100644 django/engagementmanager/vm_integration/vm_client.py mode change 100755 => 100644 django/manage.py mode change 100755 => 100644 django/mocks/__init__.py mode change 100755 => 100644 django/mocks/gitlab_mock/__init__.py mode change 100755 => 100644 django/mocks/gitlab_mock/rest/__init__.py mode change 100755 => 100644 django/mocks/gitlab_mock/rest/gitlab_files_respons_rest.py mode change 100755 => 100644 django/mocks/gitlab_mock/services/__init__.py mode change 100755 => 100644 django/mocks/gitlab_mock/services/gitlab_files_service.py mode change 100755 => 100644 django/mocks/jenkins_mock/__init__.py mode change 100755 => 100644 django/mocks/jenkins_mock/rest/__init__.py mode change 100755 => 100644 django/mocks/jenkins_mock/rest/jenkins_tests_validation_rest.py mode change 100755 => 100644 django/mocks/jenkins_mock/services/__init__.py mode change 100755 => 100644 django/mocks/jenkins_mock/services/jenkins_tests_validation_service.py mode change 100755 => 100644 django/requirements.txt mode change 100755 => 100644 django/rgwa_mock/__init__.py mode change 100755 => 100644 django/rgwa_mock/services/__init__.py mode change 100755 => 100644 django/rgwa_mock/services/rgwa_keys_service.py mode change 100755 => 100644 django/tools/__init__.py mode change 100755 => 100644 django/tox.ini mode change 100755 => 100644 django/validationmanager/__init__.py mode change 100755 => 100644 django/validationmanager/admin.py mode change 100755 => 100644 django/validationmanager/apps.py mode change 100755 => 100644 django/validationmanager/em_integration/__init__.py mode change 100755 => 100644 django/validationmanager/em_integration/em_client.py mode change 100755 => 100644 django/validationmanager/em_integration/vm_api.py mode change 100755 => 100644 django/validationmanager/git/__init__.py mode change 100755 => 100644 django/validationmanager/git/gitlab_client.py mode change 100755 => 100644 django/validationmanager/jenkins/__init__.py mode change 100755 => 100644 django/validationmanager/jenkins/jenkins_client.py mode change 100755 => 100644 django/validationmanager/migrations/0001_initial.py mode change 100755 => 100644 django/validationmanager/migrations/0002_auto_20161019_2056.py mode change 100755 => 100644 django/validationmanager/migrations/0003_auto_20170423_0531.py mode change 100755 => 100644 django/validationmanager/migrations/__init__.py mode change 100755 => 100644 django/validationmanager/models.py mode change 100755 => 100644 django/validationmanager/rados/__init__.py mode change 100755 => 100644 django/validationmanager/rados/rgwa_client.py mode change 100755 => 100644 django/validationmanager/rados/rgwa_client_factory.py mode change 100755 => 100644 django/validationmanager/rest/__init__.py mode change 100755 => 100644 django/validationmanager/rest/git_webhook_endpoint.py mode change 100755 => 100644 django/validationmanager/rest/http_response_custom.py mode change 100755 => 100644 django/validationmanager/rest/jenkins_webhook_endpoint.py mode change 100755 => 100644 django/validationmanager/templates/jenkins_job_config.xml mode change 100755 => 100644 django/validationmanager/tests/__init__.py mode change 100755 => 100644 django/validationmanager/tests/testFinishedSignal.py mode change 100755 => 100644 django/validationmanager/tests/test_git_push.py mode change 100755 => 100644 django/validationmanager/tests/test_rgwa_client_factory.py mode change 100755 => 100644 django/validationmanager/urls.py mode change 100755 => 100644 django/validationmanager/utils/__init__.py mode change 100755 => 100644 django/validationmanager/utils/clients.py mode change 100755 => 100644 django/validationmanager/utils/constants.py mode change 100755 => 100644 django/validationmanager/utils/keyawaredefaultdict.py mode change 100755 => 100644 django/vvp/__init__.py mode change 100755 => 100644 django/vvp/settings/logs/vvp-db.log mode change 100755 => 100644 django/vvp/settings/logs/vvp-debug.log mode change 100755 => 100644 django/vvp/settings/logs/vvp-info.log mode change 100755 => 100644 django/vvp/settings/logs/vvp-requests.log mode change 100755 => 100644 django/vvp/settings/tox_settings.py mode change 100755 => 100644 django/vvp/urls.py mode change 100755 => 100644 django/vvp/wsgi.py mode change 100755 => 100644 django/web/templates/admin/base.html mode change 100755 => 100644 django/web/templates/admin/base_site.html mode change 100755 => 100644 django/web/templates/admin/login.html mode change 100755 => 100644 django/web/templates/emails/activate/activate_mail_body.html mode change 100755 => 100644 django/web/templates/emails/activate/activate_mail_subject.html mode change 100755 => 100644 django/web/templates/emails/invite/invite_mail_body.html mode change 100755 => 100644 django/web/templates/emails/invite/invite_mail_subject.html mode change 100755 => 100644 django/web/templates/emails/notification/notification_digest_mail_body.html mode change 100755 => 100644 django/web/templates/emails/notification/notification_digest_mail_subject.html mode change 100755 => 100644 django/web/templates/emails/notification/notification_mail_body.html mode change 100755 => 100644 django/web/templates/emails/notification/notification_mail_subject.html mode change 100755 => 100644 django/web/templates/emails/reset_pwd/reset_pwd_instructions_mail_body.html mode change 100755 => 100644 django/web/templates/emails/reset_pwd/reset_pwd_instructions_mail_subject.html mode change 100755 => 100644 pom.xml create mode 100644 tox.ini diff --git a/.maven-dockerignore b/.maven-dockerignore new file mode 100644 index 0000000..52d95d7 --- /dev/null +++ b/.maven-dockerignore @@ -0,0 +1,2 @@ +target/docker/ + diff --git a/Dockerfile b/Dockerfile old mode 100755 new mode 100644 diff --git a/LICENSE.TXT b/LICENSE.TXT old mode 100755 new mode 100644 diff --git a/LICENSE.uWSGI b/LICENSE.uWSGI old mode 100755 new mode 100644 diff --git a/django/README.md b/django/README.md old mode 100755 new mode 100644 diff --git a/django/engagementmanager/__init__.py b/django/engagementmanager/__init__.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/admin.py b/django/engagementmanager/admin.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/apps.py b/django/engagementmanager/apps.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/bus/__init__.py b/django/engagementmanager/bus/__init__.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/bus/handlers/__init__.py b/django/engagementmanager/bus/handlers/__init__.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/bus/handlers/activity_event_handler.py b/django/engagementmanager/bus/handlers/activity_event_handler.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/bus/handlers/check_news_and_announcements_handler.py b/django/engagementmanager/bus/handlers/check_news_and_announcements_handler.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/bus/handlers/daily_notify_inactive_engagements.py b/django/engagementmanager/bus/handlers/daily_notify_inactive_engagements.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/bus/handlers/daily_notify_inactive_engagements_handler.py b/django/engagementmanager/bus/handlers/daily_notify_inactive_engagements_handler.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/bus/handlers/daily_resend_notifications_handler.py b/django/engagementmanager/bus/handlers/daily_resend_notifications_handler.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/bus/handlers/digest_email_notification_handler.py b/django/engagementmanager/bus/handlers/digest_email_notification_handler.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/bus/handlers/new_notification_handler.py b/django/engagementmanager/bus/handlers/new_notification_handler.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/bus/handlers/service_bus_base_handler.py b/django/engagementmanager/bus/handlers/service_bus_base_handler.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/bus/messages/__init__.py b/django/engagementmanager/bus/messages/__init__.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/bus/messages/activity_event_message.py b/django/engagementmanager/bus/messages/activity_event_message.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/bus/messages/daily_scheduled_message.py b/django/engagementmanager/bus/messages/daily_scheduled_message.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/bus/messages/hourly_scheduled_message.py b/django/engagementmanager/bus/messages/hourly_scheduled_message.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/bus/messages/new_notification_message.py b/django/engagementmanager/bus/messages/new_notification_message.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/bus/messages/service_bus_base_message.py b/django/engagementmanager/bus/messages/service_bus_base_message.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/cms_client/__init__.py b/django/engagementmanager/cms_client/__init__.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/cms_client/api.py b/django/engagementmanager/cms_client/api.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/decorator/__init__.py b/django/engagementmanager/decorator/__init__.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/decorator/auth.py b/django/engagementmanager/decorator/auth.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/decorator/class_decorator.py b/django/engagementmanager/decorator/class_decorator.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/decorator/log_func_entry.py b/django/engagementmanager/decorator/log_func_entry.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/decorator/retry.py b/django/engagementmanager/decorator/retry.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/git/__init__.py b/django/engagementmanager/git/__init__.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/git/git_manager.py b/django/engagementmanager/git/git_manager.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/http_client.py b/django/engagementmanager/http_client.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/mail.py b/django/engagementmanager/mail.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/management/__init__.py b/django/engagementmanager/management/__init__.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/management/commands/__init__.py b/django/engagementmanager/management/commands/__init__.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/management/commands/clean_gitlab_content.py b/django/engagementmanager/management/commands/clean_gitlab_content.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/management/commands/clean_jenkins_jobs.py b/django/engagementmanager/management/commands/clean_jenkins_jobs.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/management/commands/clean_vvp_db.py b/django/engagementmanager/management/commands/clean_vvp_db.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/management/commands/clean_vvp_system.py b/django/engagementmanager/management/commands/clean_vvp_system.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/management/commands/initial_populate_db.py b/django/engagementmanager/management/commands/initial_populate_db.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/management/commands/populate_all_gitlab_repo_and_user_and_jenkins.py b/django/engagementmanager/management/commands/populate_all_gitlab_repo_and_user_and_jenkins.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/management/commands/render_rgwa_credentials.py b/django/engagementmanager/management/commands/render_rgwa_credentials.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0001_initial.py b/django/engagementmanager/migrations/0001_initial.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0001_squashed_initial.py b/django/engagementmanager/migrations/0001_squashed_initial.py old mode 100755 new mode 100644 index 1be6a07..ae740e2 --- a/django/engagementmanager/migrations/0001_squashed_initial.py +++ b/django/engagementmanager/migrations/0001_squashed_initial.py @@ -54,7 +54,8 @@ logger = LoggingServiceFactory.get_logger() def forwards(apps, schema_editor): - if not schema_editor.connection.alias == 'default': + if not schema_editor.connection.alias == 'default' \ + or settings.DATABASES["default"]["ENGINE"] == "django.db.backends.sqlite3": return cursor = connection.cursor() diff --git a/django/engagementmanager/migrations/0002_auto_20160704_1028.py b/django/engagementmanager/migrations/0002_auto_20160704_1028.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0003_auto_20160713_0929.py b/django/engagementmanager/migrations/0003_auto_20160713_0929.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0004_auto_20160720_2143.py b/django/engagementmanager/migrations/0004_auto_20160720_2143.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0005_auto_20160815_1248.py b/django/engagementmanager/migrations/0005_auto_20160815_1248.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0006_auto_20160825_0644.py b/django/engagementmanager/migrations/0006_auto_20160825_0644.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0007_auto_20160922_0421.py b/django/engagementmanager/migrations/0007_auto_20160922_0421.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0008_auto_20161009_1210.py b/django/engagementmanager/migrations/0008_auto_20161009_1210.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0009_auto_20161018_0740.py b/django/engagementmanager/migrations/0009_auto_20161018_0740.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0010_auto_20161025_0838.py b/django/engagementmanager/migrations/0010_auto_20161025_0838.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0011_auto_20161109_0811.py b/django/engagementmanager/migrations/0011_auto_20161109_0811.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0012_auto_20161109_0822.py b/django/engagementmanager/migrations/0012_auto_20161109_0822.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0013_auto_20161128_1159.py b/django/engagementmanager/migrations/0013_auto_20161128_1159.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0014_auto_20161129_1145.py b/django/engagementmanager/migrations/0014_auto_20161129_1145.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0015_engagementstatus.py b/django/engagementmanager/migrations/0015_engagementstatus.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0016_auto_20161208_0842.py b/django/engagementmanager/migrations/0016_auto_20161208_0842.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0017_auto_20161215_1535.py b/django/engagementmanager/migrations/0017_auto_20161215_1535.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0018_set_old_notif_true.py b/django/engagementmanager/migrations/0018_set_old_notif_true.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0019_auto_20170104_1715.py b/django/engagementmanager/migrations/0019_auto_20170104_1715.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0020_add_indexes_20170108.py b/django/engagementmanager/migrations/0020_add_indexes_20170108.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0021_generate_excel_overview_sheet_procedure_20170110.py b/django/engagementmanager/migrations/0021_generate_excel_overview_sheet_procedure_20170110.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0022_auto_20170118_1520.py b/django/engagementmanager/migrations/0022_auto_20170118_1520.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0023_auto_20170123_1445.py b/django/engagementmanager/migrations/0023_auto_20170123_1445.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0024_auto_20170227_1224.py b/django/engagementmanager/migrations/0024_auto_20170227_1224.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0025_change_nextsteps_to_new_state.py b/django/engagementmanager/migrations/0025_change_nextsteps_to_new_state.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0026_add_slack_handle_to_ice_user_profile.py b/django/engagementmanager/migrations/0026_add_slack_handle_to_ice_user_profile.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0027_add_version_to_vf.py b/django/engagementmanager/migrations/0027_add_version_to_vf.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0028_auto_20170425_1310.py b/django/engagementmanager/migrations/0028_auto_20170425_1310.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0029_auto_20170504_0749.py b/django/engagementmanager/migrations/0029_auto_20170504_0749.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0030_engagement_archived_time.py b/django/engagementmanager/migrations/0030_engagement_archived_time.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0031_auto_20170620_1312.py b/django/engagementmanager/migrations/0031_auto_20170620_1312.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0032_auto_20170702_1435.py b/django/engagementmanager/migrations/0032_auto_20170702_1435.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0033_auto_20170704_0635.py b/django/engagementmanager/migrations/0033_auto_20170704_0635.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0034_engagement_is_with_files.py b/django/engagementmanager/migrations/0034_engagement_is_with_files.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0035_rgwa_fields.py b/django/engagementmanager/migrations/0035_rgwa_fields.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/0036_auto_20170906_0935.py b/django/engagementmanager/migrations/0036_auto_20170906_0935.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/migrations/__init__.py b/django/engagementmanager/migrations/__init__.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/models.py b/django/engagementmanager/models.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/nextsteps.py b/django/engagementmanager/nextsteps.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/notifications.py b/django/engagementmanager/notifications.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/__init__.py b/django/engagementmanager/rest/__init__.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/activation.py b/django/engagementmanager/rest/activation.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/activity.py b/django/engagementmanager/rest/activity.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/checklist.py b/django/engagementmanager/rest/checklist.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/checklist_audit_log.py b/django/engagementmanager/rest/checklist_audit_log.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/checklist_decision.py b/django/engagementmanager/rest/checklist_decision.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/checklist_set_state.py b/django/engagementmanager/rest/checklist_set_state.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/cms/__init__.py b/django/engagementmanager/rest/cms/__init__.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/cms/pages.py b/django/engagementmanager/rest/cms/pages.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/cms/posts.py b/django/engagementmanager/rest/cms/posts.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/csrf_exempt_session_authentication.py b/django/engagementmanager/rest/csrf_exempt_session_authentication.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/data_loader.py b/django/engagementmanager/rest/data_loader.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/deployment_target.py b/django/engagementmanager/rest/deployment_target.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/deployment_target_site.py b/django/engagementmanager/rest/deployment_target_site.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/ecomp.py b/django/engagementmanager/rest/ecomp.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/engagement.py b/django/engagementmanager/rest/engagement.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/feedback.py b/django/engagementmanager/rest/feedback.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/invite.py b/django/engagementmanager/rest/invite.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/login.py b/django/engagementmanager/rest/login.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/nextsteps.py b/django/engagementmanager/rest/nextsteps.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/notification.py b/django/engagementmanager/rest/notification.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/parsers.py b/django/engagementmanager/rest/parsers.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/signup.py b/django/engagementmanager/rest/signup.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/user.py b/django/engagementmanager/rest/user.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/validation_details.py b/django/engagementmanager/rest/validation_details.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/vendor.py b/django/engagementmanager/rest/vendor.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/vf.py b/django/engagementmanager/rest/vf.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/vfc.py b/django/engagementmanager/rest/vfc.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/rest/vvp_api_view.py b/django/engagementmanager/rest/vvp_api_view.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/scheduled_jobs.py b/django/engagementmanager/scheduled_jobs.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/serializers.py b/django/engagementmanager/serializers.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/__init__.py b/django/engagementmanager/service/__init__.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/activities_service.py b/django/engagementmanager/service/activities_service.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/authorization_service.py b/django/engagementmanager/service/authorization_service.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/base_service.py b/django/engagementmanager/service/base_service.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/bus_service.py b/django/engagementmanager/service/bus_service.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/checklist_audit_log_service.py b/django/engagementmanager/service/checklist_audit_log_service.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/checklist_decision_service.py b/django/engagementmanager/service/checklist_decision_service.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/checklist_service.py b/django/engagementmanager/service/checklist_service.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/checklist_state_service.py b/django/engagementmanager/service/checklist_state_service.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/cms/__init__.py b/django/engagementmanager/service/cms/__init__.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/cms/base_cms.py b/django/engagementmanager/service/cms/base_cms.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/cms/pages_service.py b/django/engagementmanager/service/cms/pages_service.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/cms/posts_service.py b/django/engagementmanager/service/cms/posts_service.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/deploment_target_service.py b/django/engagementmanager/service/deploment_target_service.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/ecomp_service.py b/django/engagementmanager/service/ecomp_service.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/engagement_service.py b/django/engagementmanager/service/engagement_service.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/invite_service.py b/django/engagementmanager/service/invite_service.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/logging_service.py b/django/engagementmanager/service/logging_service.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/login_service.py b/django/engagementmanager/service/login_service.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/nextstep_service.py b/django/engagementmanager/service/nextstep_service.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/user_service.py b/django/engagementmanager/service/user_service.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/vf_service.py b/django/engagementmanager/service/vf_service.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/service/vfc_service.py b/django/engagementmanager/service/vfc_service.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/slack_client/__init__.py b/django/engagementmanager/slack_client/__init__.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/slack_client/api.py b/django/engagementmanager/slack_client/api.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/sql-scripts/generate_excel_overview_sheet_procedure.sql b/django/engagementmanager/sql-scripts/generate_excel_overview_sheet_procedure.sql old mode 100755 new mode 100644 diff --git a/django/engagementmanager/templatetags/__init__.py b/django/engagementmanager/templatetags/__init__.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/templatetags/vvptags.py b/django/engagementmanager/templatetags/vvptags.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/__init__.py b/django/engagementmanager/tests/__init__.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_access_credentials.py b/django/engagementmanager/tests/test_access_credentials.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_activation.py b/django/engagementmanager/tests/test_activation.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_activities.py b/django/engagementmanager/tests/test_activities.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_add_contact.py b/django/engagementmanager/tests/test_add_contact.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_add_feedback.py b/django/engagementmanager/tests/test_add_feedback.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_add_next_step_to_checklist.py b/django/engagementmanager/tests/test_add_next_step_to_checklist.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_audit_log_and_decision_api.py b/django/engagementmanager/tests/test_audit_log_and_decision_api.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_auth_service.py b/django/engagementmanager/tests/test_auth_service.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_base_entity.py b/django/engagementmanager/tests/test_base_entity.py old mode 100755 new mode 100644 index a90be1f..b6a5ece --- a/django/engagementmanager/tests/test_base_entity.py +++ b/django/engagementmanager/tests/test_base_entity.py @@ -59,7 +59,7 @@ class TestBaseEntity(TestCase): def setUp(self): logger.debug("---------------------- TestCase " + self.__class__.__name__ + " ----------------------") - self.urlPrefix = "/ice/v1/engmgr/" + self.urlPrefix = "/%s/v1/engmgr/" % settings.PROGRAM_NAME_URL_PREFIX self.conn = http.client.HTTPConnection("127.0.0.1", 8000) # @UndefinedVariable self.c = Client() self.creator = VvpEntitiesCreator() diff --git a/django/engagementmanager/tests/test_base_transaction_entity.py b/django/engagementmanager/tests/test_base_transaction_entity.py old mode 100755 new mode 100644 index c4a5159..e206bad --- a/django/engagementmanager/tests/test_base_transaction_entity.py +++ b/django/engagementmanager/tests/test_base_transaction_entity.py @@ -53,7 +53,7 @@ class TestBaseTransactionEntity(TransactionTestCase): def setUp(self): logger.debug("---------------------- TransactionTestCase " + self.__class__.__name__ + " ----------------------") - self.urlPrefix = "/ice/v1/engmgr/" + self.urlPrefix = "/%s/v1/engmgr/" % settings.PROGRAM_NAME_URL_PREFIX self.conn = http.client.HTTPConnection("127.0.0.1", 8000) # @UndefinedVariable self.c = Client() self.creator = VvpEntitiesCreator() diff --git a/django/engagementmanager/tests/test_checklist.py b/django/engagementmanager/tests/test_checklist.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_checklist_template.py b/django/engagementmanager/tests/test_checklist_template.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_cms_documentation_search.py b/django/engagementmanager/tests/test_cms_documentation_search.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_cms_pages.py b/django/engagementmanager/tests/test_cms_pages.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_cms_posts.py b/django/engagementmanager/tests/test_cms_posts.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_deployment_target_sites.py b/django/engagementmanager/tests/test_deployment_target_sites.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_digest_email_notifications.py b/django/engagementmanager/tests/test_digest_email_notifications.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_eng_progress.py b/django/engagementmanager/tests/test_eng_progress.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_eng_status.py b/django/engagementmanager/tests/test_eng_status.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_engagement_admin_operations.py b/django/engagementmanager/tests/test_engagement_admin_operations.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_engagement_export.py b/django/engagementmanager/tests/test_engagement_export.py old mode 100755 new mode 100644 index 9cbceb0..7438658 --- a/django/engagementmanager/tests/test_engagement_export.py +++ b/django/engagementmanager/tests/test_engagement_export.py @@ -43,6 +43,7 @@ from engagementmanager.service.engagement_service import get_expanded_engs_for_e from engagementmanager.tests.test_base_entity import TestBaseEntity from engagementmanager.utils.constants import EngagementStage, Constants from engagementmanager.service.logging_service import LoggingServiceFactory +from django.conf import settings logger = LoggingServiceFactory.get_logger() @@ -112,6 +113,9 @@ class EngagementExportTestCase(TestBaseEntity): def testSuccessExport(self): self.printTestName("Success export [start]") + if settings.DATABASES["default"]["ENGINE"] == "django.db.backends.sqlite3": + return + urlStr = self.urlPrefix + 'engagement/export/?stage=Active&keyword' logger.debug( "action should success (200), and return one active engagement") diff --git a/django/engagementmanager/tests/test_expanded_eng.py b/django/engagementmanager/tests/test_expanded_eng.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_import_engagement_xls.py b/django/engagementmanager/tests/test_import_engagement_xls.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_invite_members.py b/django/engagementmanager/tests/test_invite_members.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_next_steps.py b/django/engagementmanager/tests/test_next_steps.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_next_steps_api.py b/django/engagementmanager/tests/test_next_steps_api.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_notify_inactive_engagements.py b/django/engagementmanager/tests/test_notify_inactive_engagements.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_pull_notifications.py b/django/engagementmanager/tests/test_pull_notifications.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_rados_gateway.py b/django/engagementmanager/tests/test_rados_gateway.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_remove_user_from_eng_team.py b/django/engagementmanager/tests/test_remove_user_from_eng_team.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_request_data_manager.py b/django/engagementmanager/tests/test_request_data_manager.py old mode 100755 new mode 100644 index 580301e..13e4fe0 --- a/django/engagementmanager/tests/test_request_data_manager.py +++ b/django/engagementmanager/tests/test_request_data_manager.py @@ -45,6 +45,8 @@ from django.db import connections from django.test.client import Client from django.test.testcases import TransactionTestCase from rest_framework.status import HTTP_401_UNAUTHORIZED, HTTP_200_OK + +from django.conf import settings from engagementmanager.models import Vendor from engagementmanager.tests.vvpEntitiesCreator import VvpEntitiesCreator from engagementmanager.utils.authentication import JWTAuthentication @@ -59,7 +61,7 @@ class TestRequestDataManager(TransactionTestCase): def childSetup(self): logger.debug("---------------------- TestCase " + self.__class__.__name__ + " ----------------------") - self.urlPrefix = "/ice/v1/engmgr/" + self.urlPrefix = "/%s/v1/engmgr/" % settings.PROGRAM_NAME_URL_PREFIX self.c = Client() self.creator = VvpEntitiesCreator() diff --git a/django/engagementmanager/tests/test_resend_activation_email.py b/django/engagementmanager/tests/test_resend_activation_email.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_reset_password.py b/django/engagementmanager/tests/test_reset_password.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_rgwa_client.py b/django/engagementmanager/tests/test_rgwa_client.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_set_checklist_state.py b/django/engagementmanager/tests/test_set_checklist_state.py old mode 100755 new mode 100644 index 54d3c8e..1b986ae --- a/django/engagementmanager/tests/test_set_checklist_state.py +++ b/django/engagementmanager/tests/test_set_checklist_state.py @@ -45,11 +45,19 @@ from rest_framework.status import HTTP_200_OK from uuid import uuid4 import json from engagementmanager.service.logging_service import LoggingServiceFactory +from mocks.jenkins_mock.services.jenkins_tests_validation_service import JenkinsTestsResultsSvc logger = LoggingServiceFactory.get_logger() class TestChecklistSetState(TestBaseEntity): + def initCLBody(self): + self.clbodydata['checkListName'] = ChecklistDefaultNames.HEAT_TEMPLATES + self.clbodydata['checkListTemplateUuid'] = str(self.template.uuid) + self.clbodydata['checkListAssociatedFiles'] =\ + "[\"file0/f69f4ce7-51d5-409c-9d0e-ec6b1e79df28\"," \ + " \"file1/f69f4ce7-51d5-409c-9d0e-ec6b1e79df28\"," \ + " \"file2/f69f4ce7-51d5-409c-9d0e-ec6b1e79df28\"]" def childSetup(self): self.createVendors([Constants.service_provider_company_name, 'Amdocs']) @@ -82,29 +90,22 @@ class TestChecklistSetState(TestBaseEntity): self.deploymentTarget = self.creator.createDeploymentTarget( self.randomGenerator("randomString"), self.randomGenerator("randomString")) -# self.asInfrastructure = self.creator.createApplicationServiceInfrastructure(self.randomGenerator("randomString")) self.vf = self.creator.createVF(self.randomGenerator("randomString"), self.engagement, self.deploymentTarget, False, self.vendor) -# self.vf.service_infrastructures.add(self.asInfrastructure) self.clbodydata = dict() self.initCLBody() self.checklist = Checklist.objects.create(uuid=uuid4(), name=self.clbodydata['checkListName'], validation_cycle=1, associated_files=self.clbodydata[ 'checkListAssociatedFiles'], engagement=self.engagement, template=self.template, creator=self.el_user, owner=self.el_user) self.checklist.save() - self.section = ChecklistSection.objects.create(uuid=uuid4(), name=self.randomGenerator("randomString"), weight=1.0, description=self.randomGenerator( - "randomString"), validation_instructions=self.randomGenerator("randomString"), template=self.template) - self.section.save() - self.line_item = ChecklistLineItem.objects.create(uuid=uuid4(), name=self.randomGenerator("randomString"), weight=1.0, description=self.randomGenerator( - "randomString"), line_type=CheckListLineType.auto.name, validation_instructions=self.randomGenerator("randomString"), template=self.template, section=self.section) # @UndefinedVariable - self.line_item2 = ChecklistLineItem.objects.create(uuid=uuid4(), name=self.randomGenerator("randomString"), weight=1.0, description=self.randomGenerator( - "randomString"), line_type=CheckListLineType.auto.name, validation_instructions=self.randomGenerator("randomString"), template=self.template, section=self.section) # @UndefinedVariable - self.line_item.save() - self.line_item2.save() + + self.line_items = ChecklistLineItem.objects.filter( + template=self.checklist.template)[:JenkinsTestsResultsSvc().num_of_auto_tests] + self.decision = ChecklistDecision.objects.create( - uuid=uuid4(), checklist=self.checklist, template=self.template, lineitem=self.line_item) + uuid=uuid4(), checklist=self.checklist, template=self.template, lineitem=self.line_items[0]) self.decision2 = ChecklistDecision.objects.create( - uuid=uuid4(), checklist=self.checklist, template=self.template, lineitem=self.line_item2) + uuid=uuid4(), checklist=self.checklist, template=self.template, lineitem=self.line_items[1]) self.decision.save() self.decision2.save() self.data = dict() diff --git a/django/engagementmanager/tests/test_set_eng_stage.py b/django/engagementmanager/tests/test_set_eng_stage.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_update_password.py b/django/engagementmanager/tests/test_update_password.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_update_user_account.py b/django/engagementmanager/tests/test_update_user_account.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/test_vfc.py b/django/engagementmanager/tests/test_vfc.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/tests/vvpEntitiesCreator.py b/django/engagementmanager/tests/vvpEntitiesCreator.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/urls.py b/django/engagementmanager/urls.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/utils/__init__.py b/django/engagementmanager/utils/__init__.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/utils/activities_data.py b/django/engagementmanager/utils/activities_data.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/utils/authentication.py b/django/engagementmanager/utils/authentication.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/utils/choice_enum.py b/django/engagementmanager/utils/choice_enum.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/utils/constants.py b/django/engagementmanager/utils/constants.py old mode 100755 new mode 100644 index c5b1ae9..70fab7b --- a/django/engagementmanager/utils/constants.py +++ b/django/engagementmanager/utils/constants.py @@ -54,17 +54,17 @@ class Constants(object): role_standard_user = None role_admin = None role_admin_ro = None - service_provider_company_name = "ExampleServiceProvider" - service_provider_mail_domain = ["example.com"] - service_provider_admin_mail = "admin@example.com" - service_provider_admin_ro_mail = "admin_ro@example.com" + service_provider_company_name = "ServiceProvider" + service_provider_mail_domain = ["example-domain.com"] + service_provider_admin_mail = "admin@example-domain.com" + service_provider_admin_ro_mail = "admin_ro@example-domain.com" ice_base_ctx = "/vvp/v1/engmgr/" rgwa_base_url ='http://localhost:8123/admin' default_vfc_version = "1.0.0" dbConnectionStr = "dbname='icedb' user='iceuser' host='localhost' password='Aa123456' port='5433'" dashboard_href = "Dashboard" - prodDomain = 'https://www.vvp.example.com' + prodDomain = 'https://www.vvp.example-domain.com' invite_template_dir = "emails/invite/" activate_template_dir = "emails/activate/" notification_template_dir = "emails/notification/" diff --git a/django/engagementmanager/utils/cryptography.py b/django/engagementmanager/utils/cryptography.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/utils/dates.py b/django/engagementmanager/utils/dates.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/utils/exception_handler.py b/django/engagementmanager/utils/exception_handler.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/utils/exception_message_factory.py b/django/engagementmanager/utils/exception_message_factory.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/utils/request_data_mgr.py b/django/engagementmanager/utils/request_data_mgr.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/utils/validator.py b/django/engagementmanager/utils/validator.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/utils/vvp_exceptions.py b/django/engagementmanager/utils/vvp_exceptions.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/views_helper.py b/django/engagementmanager/views_helper.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/vm_integration/__init__.py b/django/engagementmanager/vm_integration/__init__.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/vm_integration/em_api.py b/django/engagementmanager/vm_integration/em_api.py old mode 100755 new mode 100644 diff --git a/django/engagementmanager/vm_integration/vm_client.py b/django/engagementmanager/vm_integration/vm_client.py old mode 100755 new mode 100644 diff --git a/django/manage.py b/django/manage.py old mode 100755 new mode 100644 diff --git a/django/mocks/__init__.py b/django/mocks/__init__.py old mode 100755 new mode 100644 diff --git a/django/mocks/gitlab_mock/__init__.py b/django/mocks/gitlab_mock/__init__.py old mode 100755 new mode 100644 diff --git a/django/mocks/gitlab_mock/rest/__init__.py b/django/mocks/gitlab_mock/rest/__init__.py old mode 100755 new mode 100644 diff --git a/django/mocks/gitlab_mock/rest/gitlab_files_respons_rest.py b/django/mocks/gitlab_mock/rest/gitlab_files_respons_rest.py old mode 100755 new mode 100644 diff --git a/django/mocks/gitlab_mock/services/__init__.py b/django/mocks/gitlab_mock/services/__init__.py old mode 100755 new mode 100644 diff --git a/django/mocks/gitlab_mock/services/gitlab_files_service.py b/django/mocks/gitlab_mock/services/gitlab_files_service.py old mode 100755 new mode 100644 diff --git a/django/mocks/jenkins_mock/__init__.py b/django/mocks/jenkins_mock/__init__.py old mode 100755 new mode 100644 diff --git a/django/mocks/jenkins_mock/rest/__init__.py b/django/mocks/jenkins_mock/rest/__init__.py old mode 100755 new mode 100644 diff --git a/django/mocks/jenkins_mock/rest/jenkins_tests_validation_rest.py b/django/mocks/jenkins_mock/rest/jenkins_tests_validation_rest.py old mode 100755 new mode 100644 diff --git a/django/mocks/jenkins_mock/services/__init__.py b/django/mocks/jenkins_mock/services/__init__.py old mode 100755 new mode 100644 diff --git a/django/mocks/jenkins_mock/services/jenkins_tests_validation_service.py b/django/mocks/jenkins_mock/services/jenkins_tests_validation_service.py old mode 100755 new mode 100644 diff --git a/django/requirements.txt b/django/requirements.txt old mode 100755 new mode 100644 diff --git a/django/rgwa_mock/__init__.py b/django/rgwa_mock/__init__.py old mode 100755 new mode 100644 diff --git a/django/rgwa_mock/services/__init__.py b/django/rgwa_mock/services/__init__.py old mode 100755 new mode 100644 diff --git a/django/rgwa_mock/services/rgwa_keys_service.py b/django/rgwa_mock/services/rgwa_keys_service.py old mode 100755 new mode 100644 diff --git a/django/tools/__init__.py b/django/tools/__init__.py old mode 100755 new mode 100644 diff --git a/django/tox.ini b/django/tox.ini old mode 100755 new mode 100644 index 4cf7aab..dd99e5a --- a/django/tox.ini +++ b/django/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = django1-10-6 +envlist = django1-10-6, flake-env skipsdist = True [testenv] commands = django-admin.py test @@ -8,7 +8,7 @@ setenv = PYTHONPATH={toxinidir} SECRET_KEY=6mo22&_gtjf#wktqf1#ve^7=w6kx)uq0u*4ksk^aq8lte&)yul ENVIRONMENT=development - PROGRAM_NAME_URL_PREFIX=ice + PROGRAM_NAME_URL_PREFIX=vvp EMAIL_HOST=localhost EMAIL_HOST_PASSWORD= EMAIL_HOST_USER= @@ -34,11 +34,6 @@ deps = -r{toxinidir}/requirements.txt [testenv:django1-10-6] deps = {[base]deps} -;[testenv:coverage] -;commands = -; coverage run --branch --omit={envdir}/*,vvp/*.py,*/migrations/*.py {envbindir}/django-admin.py test -; coveralls -;deps = -; coverage -; coveralls -; {[testenv:django1-10-6]deps} +[testenv:flake-env] +deps = flake8 +commands = flake8 diff --git a/django/validationmanager/__init__.py b/django/validationmanager/__init__.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/admin.py b/django/validationmanager/admin.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/apps.py b/django/validationmanager/apps.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/em_integration/__init__.py b/django/validationmanager/em_integration/__init__.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/em_integration/em_client.py b/django/validationmanager/em_integration/em_client.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/em_integration/vm_api.py b/django/validationmanager/em_integration/vm_api.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/git/__init__.py b/django/validationmanager/git/__init__.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/git/gitlab_client.py b/django/validationmanager/git/gitlab_client.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/jenkins/__init__.py b/django/validationmanager/jenkins/__init__.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/jenkins/jenkins_client.py b/django/validationmanager/jenkins/jenkins_client.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/migrations/0001_initial.py b/django/validationmanager/migrations/0001_initial.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/migrations/0002_auto_20161019_2056.py b/django/validationmanager/migrations/0002_auto_20161019_2056.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/migrations/0003_auto_20170423_0531.py b/django/validationmanager/migrations/0003_auto_20170423_0531.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/migrations/__init__.py b/django/validationmanager/migrations/__init__.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/models.py b/django/validationmanager/models.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/rados/__init__.py b/django/validationmanager/rados/__init__.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/rados/rgwa_client.py b/django/validationmanager/rados/rgwa_client.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/rados/rgwa_client_factory.py b/django/validationmanager/rados/rgwa_client_factory.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/rest/__init__.py b/django/validationmanager/rest/__init__.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/rest/git_webhook_endpoint.py b/django/validationmanager/rest/git_webhook_endpoint.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/rest/http_response_custom.py b/django/validationmanager/rest/http_response_custom.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/rest/jenkins_webhook_endpoint.py b/django/validationmanager/rest/jenkins_webhook_endpoint.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/templates/jenkins_job_config.xml b/django/validationmanager/templates/jenkins_job_config.xml old mode 100755 new mode 100644 index c7e963f..8a83b05 --- a/django/validationmanager/templates/jenkins_job_config.xml +++ b/django/validationmanager/templates/jenkins_job_config.xml @@ -1,41 +1,3 @@ - diff --git a/django/validationmanager/tests/__init__.py b/django/validationmanager/tests/__init__.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/tests/testFinishedSignal.py b/django/validationmanager/tests/testFinishedSignal.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/tests/test_git_push.py b/django/validationmanager/tests/test_git_push.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/tests/test_rgwa_client_factory.py b/django/validationmanager/tests/test_rgwa_client_factory.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/urls.py b/django/validationmanager/urls.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/utils/__init__.py b/django/validationmanager/utils/__init__.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/utils/clients.py b/django/validationmanager/utils/clients.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/utils/constants.py b/django/validationmanager/utils/constants.py old mode 100755 new mode 100644 diff --git a/django/validationmanager/utils/keyawaredefaultdict.py b/django/validationmanager/utils/keyawaredefaultdict.py old mode 100755 new mode 100644 diff --git a/django/vvp/__init__.py b/django/vvp/__init__.py old mode 100755 new mode 100644 diff --git a/django/vvp/settings/logs/vvp-db.log b/django/vvp/settings/logs/vvp-db.log old mode 100755 new mode 100644 diff --git a/django/vvp/settings/logs/vvp-debug.log b/django/vvp/settings/logs/vvp-debug.log old mode 100755 new mode 100644 diff --git a/django/vvp/settings/logs/vvp-info.log b/django/vvp/settings/logs/vvp-info.log old mode 100755 new mode 100644 diff --git a/django/vvp/settings/logs/vvp-requests.log b/django/vvp/settings/logs/vvp-requests.log old mode 100755 new mode 100644 diff --git a/django/vvp/settings/tox_settings.py b/django/vvp/settings/tox_settings.py old mode 100755 new mode 100644 index 6cb4353..530bd7a --- a/django/vvp/settings/tox_settings.py +++ b/django/vvp/settings/tox_settings.py @@ -38,12 +38,12 @@ PROGRAM_NAME_URL_PREFIX = os.environ['PROGRAM_NAME_URL_PREFIX'] # https://docs.djangoproject.com/en/1.10/ref/settings/#allowed-hosts # Anything in the Host header that does not match our expected domain should # raise SuspiciousOperation exception. -ALLOWED_HOSTS = ['.d2ice.att.io','em','em.default'] +ALLOWED_HOSTS = ['*'] DEBUG = False if ENVIRONMENT == 'production': - EMAIL_BACKEND = 'django.db.backends.sqlite3' + EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' EMAIL_HOST = os.environ['EMAIL_HOST'] EMAIL_HOST_PASSWORD = os.environ['EMAIL_HOST_PASSWORD'] EMAIL_HOST_USER = os.environ['EMAIL_HOST_USER'] @@ -133,12 +133,16 @@ WSGI_APPLICATION = 'vvp.wsgi.application' # https://docs.djangoproject.com/en/1.9/ref/settings/#databases DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.postgresql', - 'NAME': os.environ['PGDATABASE'], - 'USER': os.environ['PGUSER'], - 'PASSWORD': os.environ['PGPASSWORD'], - 'HOST': os.environ['PGHOST'], - 'PORT': os.environ['PGPORT'], + 'NAME': 'emdb.db', + 'ENGINE': 'django.db.backends.sqlite3', + 'TEST_NAME': 'emdb.db' + + # 'ENGINE': 'django.db.backends.postgresql', + # 'NAME': os.environ['PGDATABASE'], + # 'USER': os.environ['PGUSER'], + # 'PASSWORD': os.environ['PGPASSWORD'], + # 'HOST': os.environ['PGHOST'], + # 'PORT': os.environ['PGPORT'], } } @@ -271,7 +275,7 @@ JENKINS_USERNAME = "admin" JENKINS_PASSWORD = os.environ['SECRET_JENKINS_PASSWORD'] IS_CL_CREATED_ON_REVIEW_STATE = False -IS_SIGNAL_ENABLED = True +IS_SIGNAL_ENABLED = False RECENT_ENG_TTL = 3 # In days CMS_URL = "http://cms/api/" CMS_APP_CLIENT_ID = os.environ['SECRET_CMS_APP_CLIENT_ID'] diff --git a/django/vvp/urls.py b/django/vvp/urls.py old mode 100755 new mode 100644 diff --git a/django/vvp/wsgi.py b/django/vvp/wsgi.py old mode 100755 new mode 100644 diff --git a/django/web/templates/admin/base.html b/django/web/templates/admin/base.html old mode 100755 new mode 100644 index d9f927b..1a18977 --- a/django/web/templates/admin/base.html +++ b/django/web/templates/admin/base.html @@ -1,41 +1,40 @@ - +{#============LICENSE_START========================================== #} +{# org.onap.vvp/engagementmgr#} +{# ===================================================================#} +{# Copyright © 2017 AT&T Intellectual Property. All rights reserved.#} +{# ===================================================================#} +{##} +{# Unless otherwise specified, all software contained herein is licensed#} +{# under the Apache License, Version 2.0 (the “License”);#} +{# you may not use this software except in compliance with the License.#} +{# You may obtain a copy of the License at#} +{##} +{# http://www.apache.org/licenses/LICENSE-2.0#} +{##} +{# Unless required by applicable law or agreed to in writing, software#} +{# distributed under the License is distributed on an "AS IS" BASIS,#} +{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#} +{# See the License for the specific language governing permissions and#} +{# limitations under the License.#} +{##} +{##} +{##} +{# Unless otherwise specified, all documentation contained herein is licensed#} +{# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);#} +{# you may not use this documentation except in compliance with the License.#} +{# You may obtain a copy of the License at#} +{##} +{# https://creativecommons.org/licenses/by/4.0/#} +{##} +{# Unless required by applicable law or agreed to in writing, documentation#} +{# distributed under the License is distributed on an "AS IS" BASIS,#} +{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#} +{# See the License for the specific language governing permissions and#} +{# limitations under the License.#} +{##} +{# ============LICENSE_END============================================#} +{##} +{# ECOMP is a trademark and service mark of AT&T Intellectual Property.#} {% load i18n static %} {% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %} diff --git a/django/web/templates/admin/base_site.html b/django/web/templates/admin/base_site.html old mode 100755 new mode 100644 index 1a2275d..e36b9a4 --- a/django/web/templates/admin/base_site.html +++ b/django/web/templates/admin/base_site.html @@ -1,41 +1,40 @@ - +{#============LICENSE_START========================================== #} +{# org.onap.vvp/engagementmgr#} +{# ===================================================================#} +{# Copyright © 2017 AT&T Intellectual Property. All rights reserved.#} +{# ===================================================================#} +{##} +{# Unless otherwise specified, all software contained herein is licensed#} +{# under the Apache License, Version 2.0 (the “License”);#} +{# you may not use this software except in compliance with the License.#} +{# You may obtain a copy of the License at#} +{##} +{# http://www.apache.org/licenses/LICENSE-2.0#} +{##} +{# Unless required by applicable law or agreed to in writing, software#} +{# distributed under the License is distributed on an "AS IS" BASIS,#} +{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#} +{# See the License for the specific language governing permissions and#} +{# limitations under the License.#} +{##} +{##} +{##} +{# Unless otherwise specified, all documentation contained herein is licensed#} +{# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);#} +{# you may not use this documentation except in compliance with the License.#} +{# You may obtain a copy of the License at#} +{##} +{# https://creativecommons.org/licenses/by/4.0/#} +{##} +{# Unless required by applicable law or agreed to in writing, documentation#} +{# distributed under the License is distributed on an "AS IS" BASIS,#} +{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#} +{# See the License for the specific language governing permissions and#} +{# limitations under the License.#} +{##} +{# ============LICENSE_END============================================#} +{##} +{# ECOMP is a trademark and service mark of AT&T Intellectual Property.#} {% extends "admin/base.html" %} {% load vvptags %} diff --git a/django/web/templates/admin/login.html b/django/web/templates/admin/login.html old mode 100755 new mode 100644 index 5acf9b5..5e31bee --- a/django/web/templates/admin/login.html +++ b/django/web/templates/admin/login.html @@ -1,41 +1,40 @@ - +{#============LICENSE_START========================================== #} +{# org.onap.vvp/engagementmgr#} +{# ===================================================================#} +{# Copyright © 2017 AT&T Intellectual Property. All rights reserved.#} +{# ===================================================================#} +{##} +{# Unless otherwise specified, all software contained herein is licensed#} +{# under the Apache License, Version 2.0 (the “License”);#} +{# you may not use this software except in compliance with the License.#} +{# You may obtain a copy of the License at#} +{##} +{# http://www.apache.org/licenses/LICENSE-2.0#} +{##} +{# Unless required by applicable law or agreed to in writing, software#} +{# distributed under the License is distributed on an "AS IS" BASIS,#} +{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#} +{# See the License for the specific language governing permissions and#} +{# limitations under the License.#} +{##} +{##} +{##} +{# Unless otherwise specified, all documentation contained herein is licensed#} +{# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);#} +{# you may not use this documentation except in compliance with the License.#} +{# You may obtain a copy of the License at#} +{##} +{# https://creativecommons.org/licenses/by/4.0/#} +{##} +{# Unless required by applicable law or agreed to in writing, documentation#} +{# distributed under the License is distributed on an "AS IS" BASIS,#} +{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#} +{# See the License for the specific language governing permissions and#} +{# limitations under the License.#} +{##} +{# ============LICENSE_END============================================#} +{##} +{# ECOMP is a trademark and service mark of AT&T Intellectual Property.#} {% extends "admin/base_site.html" %} {% load i18n admin_static %} diff --git a/django/web/templates/emails/activate/activate_mail_body.html b/django/web/templates/emails/activate/activate_mail_body.html old mode 100755 new mode 100644 index 0751b00..3607a78 --- a/django/web/templates/emails/activate/activate_mail_body.html +++ b/django/web/templates/emails/activate/activate_mail_body.html @@ -1,41 +1,40 @@ - +{#============LICENSE_START========================================== #} +{# org.onap.vvp/engagementmgr#} +{# ===================================================================#} +{# Copyright ? 2017 AT&T Intellectual Property. All rights reserved.#} +{# ===================================================================#} +{##} +{# Unless otherwise specified, all software contained herein is licensed#} +{# under the Apache License, Version 2.0 (the ?License?);#} +{# you may not use this software except in compliance with the License.#} +{# You may obtain a copy of the License at#} +{##} +{# http://www.apache.org/licenses/LICENSE-2.0#} +{##} +{# Unless required by applicable law or agreed to in writing, software#} +{# distributed under the License is distributed on an "AS IS" BASIS,#} +{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#} +{# See the License for the specific language governing permissions and#} +{# limitations under the License.#} +{##} +{##} +{##} +{# Unless otherwise specified, all documentation contained herein is licensed#} +{# under the Creative Commons License, Attribution 4.0 Intl. (the ?License?);#} +{# you may not use this documentation except in compliance with the License.#} +{# You may obtain a copy of the License at#} +{##} +{# https://creativecommons.org/licenses/by/4.0/#} +{##} +{# Unless required by applicable law or agreed to in writing, documentation#} +{# distributed under the License is distributed on an "AS IS" BASIS,#} +{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#} +{# See the License for the specific language governing permissions and#} +{# limitations under the License.#} +{##} +{# ============LICENSE_END============================================#} +{##} +{# ECOMP is a trademark and service mark of AT&T Intellectual Property.#} diff --git a/django/web/templates/emails/activate/activate_mail_subject.html b/django/web/templates/emails/activate/activate_mail_subject.html old mode 100755 new mode 100644 index 0adbc20..25ce1c6 --- a/django/web/templates/emails/activate/activate_mail_subject.html +++ b/django/web/templates/emails/activate/activate_mail_subject.html @@ -1,39 +1 @@ - -{{program_name}}: Welcome - just one more step! +{{program_name}}: Welcome - just one more step! \ No newline at end of file diff --git a/django/web/templates/emails/invite/invite_mail_body.html b/django/web/templates/emails/invite/invite_mail_body.html old mode 100755 new mode 100644 index aede3e5..b223c39 --- a/django/web/templates/emails/invite/invite_mail_body.html +++ b/django/web/templates/emails/invite/invite_mail_body.html @@ -1,41 +1,40 @@ - +{#============LICENSE_START========================================== #} +{# org.onap.vvp/engagementmgr#} +{# ===================================================================#} +{# Copyright ? 2017 AT&T Intellectual Property. All rights reserved.#} +{# ===================================================================#} +{##} +{# Unless otherwise specified, all software contained herein is licensed#} +{# under the Apache License, Version 2.0 (the ?License?);#} +{# you may not use this software except in compliance with the License.#} +{# You may obtain a copy of the License at#} +{##} +{# http://www.apache.org/licenses/LICENSE-2.0#} +{##} +{# Unless required by applicable law or agreed to in writing, software#} +{# distributed under the License is distributed on an "AS IS" BASIS,#} +{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#} +{# See the License for the specific language governing permissions and#} +{# limitations under the License.#} +{##} +{##} +{##} +{# Unless otherwise specified, all documentation contained herein is licensed#} +{# under the Creative Commons License, Attribution 4.0 Intl. (the ?License?);#} +{# you may not use this documentation except in compliance with the License.#} +{# You may obtain a copy of the License at#} +{##} +{# https://creativecommons.org/licenses/by/4.0/#} +{##} +{# Unless required by applicable law or agreed to in writing, documentation#} +{# distributed under the License is distributed on an "AS IS" BASIS,#} +{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#} +{# See the License for the specific language governing permissions and#} +{# limitations under the License.#} +{##} +{# ============LICENSE_END============================================#} +{##} +{# ECOMP is a trademark and service mark of AT&T Intellectual Property.#} diff --git a/django/web/templates/emails/invite/invite_mail_subject.html b/django/web/templates/emails/invite/invite_mail_subject.html old mode 100755 new mode 100644 index d42fe48..3ba5699 --- a/django/web/templates/emails/invite/invite_mail_subject.html +++ b/django/web/templates/emails/invite/invite_mail_subject.html @@ -1,39 +1 @@ - -{{program_name}}: You have been invited as a team member to {{ vf_name }} +{{program_name}}: You have been invited as a team member to {{ vf_name }} \ No newline at end of file diff --git a/django/web/templates/emails/notification/notification_digest_mail_body.html b/django/web/templates/emails/notification/notification_digest_mail_body.html old mode 100755 new mode 100644 index 14d9e82..594e84c --- a/django/web/templates/emails/notification/notification_digest_mail_body.html +++ b/django/web/templates/emails/notification/notification_digest_mail_body.html @@ -1,41 +1,40 @@ - +{#============LICENSE_START========================================== #} +{# org.onap.vvp/engagementmgr#} +{# ===================================================================#} +{# Copyright ? 2017 AT&T Intellectual Property. All rights reserved.#} +{# ===================================================================#} +{##} +{# Unless otherwise specified, all software contained herein is licensed#} +{# under the Apache License, Version 2.0 (the ?License?);#} +{# you may not use this software except in compliance with the License.#} +{# You may obtain a copy of the License at#} +{##} +{# http://www.apache.org/licenses/LICENSE-2.0#} +{##} +{# Unless required by applicable law or agreed to in writing, software#} +{# distributed under the License is distributed on an "AS IS" BASIS,#} +{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#} +{# See the License for the specific language governing permissions and#} +{# limitations under the License.#} +{##} +{##} +{##} +{# Unless otherwise specified, all documentation contained herein is licensed#} +{# under the Creative Commons License, Attribution 4.0 Intl. (the ?License?);#} +{# you may not use this documentation except in compliance with the License.#} +{# You may obtain a copy of the License at#} +{##} +{# https://creativecommons.org/licenses/by/4.0/#} +{##} +{# Unless required by applicable law or agreed to in writing, documentation#} +{# distributed under the License is distributed on an "AS IS" BASIS,#} +{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#} +{# See the License for the specific language governing permissions and#} +{# limitations under the License.#} +{##} +{# ============LICENSE_END============================================#} +{##} +{# ECOMP is a trademark and service mark of AT&T Intellectual Property.#} diff --git a/django/web/templates/emails/notification/notification_digest_mail_subject.html b/django/web/templates/emails/notification/notification_digest_mail_subject.html old mode 100755 new mode 100644 index 3172650..5ffca30 --- a/django/web/templates/emails/notification/notification_digest_mail_subject.html +++ b/django/web/templates/emails/notification/notification_digest_mail_subject.html @@ -1,39 +1 @@ - -{{program_name}}: {{notification_subject}} +{{program_name}}: {{notification_subject}} \ No newline at end of file diff --git a/django/web/templates/emails/notification/notification_mail_body.html b/django/web/templates/emails/notification/notification_mail_body.html old mode 100755 new mode 100644 index 4a16fd1..1849e27 --- a/django/web/templates/emails/notification/notification_mail_body.html +++ b/django/web/templates/emails/notification/notification_mail_body.html @@ -1,41 +1,40 @@ - +{#============LICENSE_START========================================== #} +{# org.onap.vvp/engagementmgr#} +{# ===================================================================#} +{# Copyright ? 2017 AT&T Intellectual Property. All rights reserved.#} +{# ===================================================================#} +{##} +{# Unless otherwise specified, all software contained herein is licensed#} +{# under the Apache License, Version 2.0 (the ?License?);#} +{# you may not use this software except in compliance with the License.#} +{# You may obtain a copy of the License at#} +{##} +{# http://www.apache.org/licenses/LICENSE-2.0#} +{##} +{# Unless required by applicable law or agreed to in writing, software#} +{# distributed under the License is distributed on an "AS IS" BASIS,#} +{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#} +{# See the License for the specific language governing permissions and#} +{# limitations under the License.#} +{##} +{##} +{##} +{# Unless otherwise specified, all documentation contained herein is licensed#} +{# under the Creative Commons License, Attribution 4.0 Intl. (the ?License?);#} +{# you may not use this documentation except in compliance with the License.#} +{# You may obtain a copy of the License at#} +{##} +{# https://creativecommons.org/licenses/by/4.0/#} +{##} +{# Unless required by applicable law or agreed to in writing, documentation#} +{# distributed under the License is distributed on an "AS IS" BASIS,#} +{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#} +{# See the License for the specific language governing permissions and#} +{# limitations under the License.#} +{##} +{# ============LICENSE_END============================================#} +{##} +{# ECOMP is a trademark and service mark of AT&T Intellectual Property.#} diff --git a/django/web/templates/emails/notification/notification_mail_subject.html b/django/web/templates/emails/notification/notification_mail_subject.html old mode 100755 new mode 100644 index 3172650..5ffca30 --- a/django/web/templates/emails/notification/notification_mail_subject.html +++ b/django/web/templates/emails/notification/notification_mail_subject.html @@ -1,39 +1 @@ - -{{program_name}}: {{notification_subject}} +{{program_name}}: {{notification_subject}} \ No newline at end of file diff --git a/django/web/templates/emails/reset_pwd/reset_pwd_instructions_mail_body.html b/django/web/templates/emails/reset_pwd/reset_pwd_instructions_mail_body.html old mode 100755 new mode 100644 index 190eb47..2c744f1 --- a/django/web/templates/emails/reset_pwd/reset_pwd_instructions_mail_body.html +++ b/django/web/templates/emails/reset_pwd/reset_pwd_instructions_mail_body.html @@ -1,41 +1,40 @@ - +{#============LICENSE_START========================================== #} +{# org.onap.vvp/engagementmgr#} +{# ===================================================================#} +{# Copyright ? 2017 AT&T Intellectual Property. All rights reserved.#} +{# ===================================================================#} +{##} +{# Unless otherwise specified, all software contained herein is licensed#} +{# under the Apache License, Version 2.0 (the ?License?);#} +{# you may not use this software except in compliance with the License.#} +{# You may obtain a copy of the License at#} +{##} +{# http://www.apache.org/licenses/LICENSE-2.0#} +{##} +{# Unless required by applicable law or agreed to in writing, software#} +{# distributed under the License is distributed on an "AS IS" BASIS,#} +{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#} +{# See the License for the specific language governing permissions and#} +{# limitations under the License.#} +{##} +{##} +{##} +{# Unless otherwise specified, all documentation contained herein is licensed#} +{# under the Creative Commons License, Attribution 4.0 Intl. (the ?License?);#} +{# you may not use this documentation except in compliance with the License.#} +{# You may obtain a copy of the License at#} +{##} +{# https://creativecommons.org/licenses/by/4.0/#} +{##} +{# Unless required by applicable law or agreed to in writing, documentation#} +{# distributed under the License is distributed on an "AS IS" BASIS,#} +{# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#} +{# See the License for the specific language governing permissions and#} +{# limitations under the License.#} +{##} +{# ============LICENSE_END============================================#} +{##} +{# ECOMP is a trademark and service mark of AT&T Intellectual Property.#} diff --git a/django/web/templates/emails/reset_pwd/reset_pwd_instructions_mail_subject.html b/django/web/templates/emails/reset_pwd/reset_pwd_instructions_mail_subject.html old mode 100755 new mode 100644 index 7f22ef1..c29127a --- a/django/web/templates/emails/reset_pwd/reset_pwd_instructions_mail_subject.html +++ b/django/web/templates/emails/reset_pwd/reset_pwd_instructions_mail_subject.html @@ -1,39 +1 @@ - -{{program_name}}: Reset Password +{{program_name}}: Reset Password \ No newline at end of file diff --git a/pom.xml b/pom.xml old mode 100755 new mode 100644 diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..a88fc60 --- /dev/null +++ b/tox.ini @@ -0,0 +1,49 @@ +[tox] +envlist = django1-10-6, style +skipsdist = True + +[testenv] +commands = django-admin.py test +setenv = + DJANGO_SETTINGS_MODULE=vvp.settings.tox_settings + PYTHONPATH={toxinidir} + SECRET_KEY=6mo22&_gtjf#wktqf1#ve^7=w6kx)uq0u*4ksk^aq8lte&)yul + ENVIRONMENT=development + PROGRAM_NAME_URL_PREFIX=vvp + EMAIL_HOST=localhost + EMAIL_HOST_PASSWORD= + EMAIL_HOST_USER= + EMAIL_PORT=25 + PGDATABASE=icedb + PGUSER=iceuser + PGPASSWORD=Aa123456 + PGHOST=localhost + PGPORT=5433 + SECRET_WEBHOOK_TOKEN=Aiwi8se4ien0foW6eimahch2zahshaGi + SECRET_GITLAB_AUTH_TOKEN=ieNgathapoo4zohvee9a + SECRET_JENKINS_PASSWORD=xaiyie0wuoqueuBu + SECRET_CMS_APP_CLIENT_ID=MHmJo0ccDheVVsIiQHZnY6LXPAC6H6HAMzhCCM16 + SECRET_CMS_APP_CLIENT_SECRET=nI8QCFrKMpnw5nTs + SLACK_API_TOKEN= + S3_HOST=dev-s3.d2ice.att.io + S3_PORT=443 + AWS_ACCESS_KEY_ID=FD21HBU2KRN3UVD1MWRN + AWS_SECRET_ACCESS_KEY=TKoiwxziUWG9cTYUknUkFGmmyuQ27nP2lCiutEsD + STATIC_ROOT=/app/htdocs + +[base] +deps = -r{toxinidir}/django/requirements.txt + +[testenv:django1-10-6] +deps = + {[base]deps} + +[testenv:style] +commands = flake8 + +[testenv:py3] +basepython=python3 + +[flake8] +show-source = True +exclude=venv-tox,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build -- cgit