From d63e9ab9672f6a38a8dbae146356e6b0ad2f8dd7 Mon Sep 17 00:00:00 2001
From: Irina Peshinskaya <ipeshinskaya@sipwise.com>
Date: Thu, 13 Nov 2014 06:24:46 +0200
Subject: [PATCH] MT#9177 Some fixes for this layout

---
 lib/NGCP/Panel/Utils/DeviceBootstrap/Panasonic.pm | 3 ++-
 lib/NGCP/Panel/Utils/DeviceBootstrap/RPC.pm       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/NGCP/Panel/Utils/DeviceBootstrap/Panasonic.pm b/lib/NGCP/Panel/Utils/DeviceBootstrap/Panasonic.pm
index f383992c14..010234e8c2 100644
--- a/lib/NGCP/Panel/Utils/DeviceBootstrap/Panasonic.pm
+++ b/lib/NGCP/Panel/Utils/DeviceBootstrap/Panasonic.pm
@@ -2,6 +2,7 @@ package NGCP::Panel::Utils::DeviceBootstrap::Panasonic;
 
 use strict;
 use Moose;
+use Data::Dumper;
 extends 'NGCP::Panel::Utils::DeviceBootstrap::RPC';
 
 has 'rpc_server_params' => (
@@ -27,7 +28,7 @@ sub rpc_server_params{
         port     => '443',
         path     => '/redirect/xmlrpc',
     };
-    $cfg->{headers} = { $self->get_basic_authorization($self->params->{credentials}) };
+    $cfg->{headers} = { %{$self->get_basic_authorization($self->params->{credentials})} };
     $self->{rpc_server_params} = $cfg;
     return $self->{rpc_server_params};
 }
diff --git a/lib/NGCP/Panel/Utils/DeviceBootstrap/RPC.pm b/lib/NGCP/Panel/Utils/DeviceBootstrap/RPC.pm
index 9f5bd79b2c..7eb2a38569 100644
--- a/lib/NGCP/Panel/Utils/DeviceBootstrap/RPC.pm
+++ b/lib/NGCP/Panel/Utils/DeviceBootstrap/RPC.pm
@@ -64,8 +64,8 @@ sub rpc_https_call{
 sub init_content_params{
     my($self) = @_;
     $self->params->{redirect_uri_params} ||= '{MAC}';
-    $self->content_params->{uri} = $self->get_bootstrap_uri();
     $self->{content_params} ||= {};
+    $self->content_params->{uri} = $self->get_bootstrap_uri();
 
     $self->content_params->{mac} = normalize_mac($self->params->{mac});
     if(defined $self->params->{mac_old}) {