From 19483d1be8195ebb4cc9d7034536e6b36ef47574 Mon Sep 17 00:00:00 2001 From: janki Date: Thu, 9 Feb 2017 06:27:48 +0530 Subject: [PATCH] Add onboarded as default template-source After migrating to inline vnf features, the pre-exisitng vnfds donot show up in vnfd-list. This patch adds template-source default as onboarded in the migration script. Co-Authored-By: janki Co-Authored-By: yong sheng gong Change-Id: If8ce2ce378a8e6e730c3f90363e28438ea31765c Closes-Bug: #1663063 --- .../alembic_migrations/versions/HEAD | 2 +- ...7_add_default_onboarded_template_source.py | 36 +++++++++++++++++++ tacker/db/vnfm/vnfm_db.py | 2 +- 3 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 tacker/db/migration/alembic_migrations/versions/ef14f8026327_add_default_onboarded_template_source.py diff --git a/tacker/db/migration/alembic_migrations/versions/HEAD b/tacker/db/migration/alembic_migrations/versions/HEAD index f3e3dceed..436e259b9 100644 --- a/tacker/db/migration/alembic_migrations/versions/HEAD +++ b/tacker/db/migration/alembic_migrations/versions/HEAD @@ -1 +1 @@ -e8918cda6433 +ef14f8026327 diff --git a/tacker/db/migration/alembic_migrations/versions/ef14f8026327_add_default_onboarded_template_source.py b/tacker/db/migration/alembic_migrations/versions/ef14f8026327_add_default_onboarded_template_source.py new file mode 100644 index 000000000..4c73ad398 --- /dev/null +++ b/tacker/db/migration/alembic_migrations/versions/ef14f8026327_add_default_onboarded_template_source.py @@ -0,0 +1,36 @@ +# Copyright 2017 OpenStack Foundation +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file 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. +# + +"""add default onboarded template source + +Revision ID: ef14f8026327 +Revises: e8918cda6433 +Create Date: 2017-02-10 12:10:09.606460 + +""" + +# revision identifiers, used by Alembic. +revision = 'ef14f8026327' +down_revision = 'e8918cda6433' + +from alembic import op + + +def upgrade(active_plugins=None, options=None): + op.alter_column('vnfd', 'template_source', + server_default="onboarded") + + op.execute("UPDATE vnfd set template_source='onboarded'" + " WHERE template_source is NULL") diff --git a/tacker/db/vnfm/vnfm_db.py b/tacker/db/vnfm/vnfm_db.py index 407e94f93..e7ca3763b 100644 --- a/tacker/db/vnfm/vnfm_db.py +++ b/tacker/db/vnfm/vnfm_db.py @@ -68,7 +68,7 @@ class VNFD(model_base.BASE, models_v1.HasId, models_v1.HasTenant, backref='vnfd') # vnfd template source - inline or onboarded - template_source = sa.Column(sa.String(255)) + template_source = sa.Column(sa.String(255), server_default='onboarded') class ServiceType(model_base.BASE, models_v1.HasId, models_v1.HasTenant):