From 17c40c12418f16cf5f112169044fd3f4ccc37e7e Mon Sep 17 00:00:00 2001 From: Irina Peshinskaya Date: Thu, 6 Nov 2014 19:03:01 +0200 Subject: [PATCH] MT#9177 Add bootstrap_uri and fix tables relations --- lib/NGCP/Schema/Result/autoprov_devices.pm | 2 ++ lib/NGCP/Schema/Result/autoprov_sync.pm | 7 ------- lib/NGCP/Schema/Result/autoprov_sync_parameters.pm | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/NGCP/Schema/Result/autoprov_devices.pm b/lib/NGCP/Schema/Result/autoprov_devices.pm index ce807a44..94df6d1b 100644 --- a/lib/NGCP/Schema/Result/autoprov_devices.pm +++ b/lib/NGCP/Schema/Result/autoprov_devices.pm @@ -37,6 +37,8 @@ __PACKAGE__->add_columns( extra => { list => ["http","redirect_panasonic","redirect_linksys"] }, is_nullable => 0, }, + "bootstrap_uri", + { data_type => "varchar", is_nullable => 0, size => 255 }, ); __PACKAGE__->belongs_to( diff --git a/lib/NGCP/Schema/Result/autoprov_sync.pm b/lib/NGCP/Schema/Result/autoprov_sync.pm index 88c2c9d4..d8fd727c 100644 --- a/lib/NGCP/Schema/Result/autoprov_sync.pm +++ b/lib/NGCP/Schema/Result/autoprov_sync.pm @@ -22,13 +22,6 @@ __PACKAGE__->add_columns( { data_type => "integer", extra => { unsigned => 1 }, is_nullable => 0 }, "parameter_value", { data_type => "varchar", size => 255, is_nullable => 0 }, - "bootstrap_method", - { - data_type => "enum", - default_value => "http", - extra => { list => ["http","ztp_panasonic","ztp_linksys"] }, - is_nullable => 0, - }, ); __PACKAGE__->belongs_to( diff --git a/lib/NGCP/Schema/Result/autoprov_sync_parameters.pm b/lib/NGCP/Schema/Result/autoprov_sync_parameters.pm index 0db91d7f..718a4548 100644 --- a/lib/NGCP/Schema/Result/autoprov_sync_parameters.pm +++ b/lib/NGCP/Schema/Result/autoprov_sync_parameters.pm @@ -36,7 +36,7 @@ __PACKAGE__->add_columns( __PACKAGE__->has_many( "autoprov_sync", "NGCP::Schema::Result::autoprov_sync", - { id => "parameter_id" }, + { "foreign.parameter_id" => "self.id" }, { is_deferrable => 1, join_type => "LEFT",