MT#15883 implement rtc-reseller connection

creating and deleting the entities users and networks
via the rtc api, when a reseller is created or modified

Change-Id: I2e9c785cacec680d1b22827983abca6037cdee3b
changes/58/3658/10
Gerhard Jungwirth 10 years ago
parent 7ebf28c5b6
commit 81c4dde54f

1
.gitignore vendored

@ -39,3 +39,4 @@ MYMETA.*
SIGNATURE
NGCP-Panel-*
.perlcritic-history
ngcp_panel_local.conf

@ -3,6 +3,7 @@ use NGCP::Panel::Utils::Generic qw(:all);
use Sipwise::Base;
use Moose;
#use namespace::sweep;
use JSON qw();
use boolean qw(true);
use Data::HAL qw();
use Data::HAL::Link qw();
@ -11,6 +12,7 @@ use HTTP::Status qw(:constants);
use MooseX::ClassAttribute qw(class_has);
use NGCP::Panel::Utils::DateTime;
use NGCP::Panel::Utils::Reseller;
use NGCP::Panel::Utils::Rtc;
use Path::Tiny qw(path);
BEGIN { extends 'Catalyst::Controller::ActionRole'; }
require Catalyst::ActionRole::ACL;
@ -182,8 +184,16 @@ sub POST :Allow {
my $reseller;
try {
$reseller = $schema->resultset('resellers')->create($resource);
$reseller = $schema->resultset('resellers')->create({
name => $resource->{name},
status => $resource->{status},
contract_id => $resource->{contract_id},
});
NGCP::Panel::Utils::Reseller::create_email_templates( c => $c, reseller => $reseller );
NGCP::Panel::Utils::Rtc::modify_reseller_rtc(undef, $resource, $c->config,
$reseller, sub {
$c->log->warn(shift); return;
});
} catch($e) {
$c->log->error("failed to create reseller: $e"); # TODO: user, message, trace, ...
$self->error($c, HTTP_INTERNAL_SERVER_ERROR, "Failed to create reseller.");

@ -106,13 +106,14 @@ sub PATCH :Allow {
);
last unless $json;
my $form = $self->get_form($c);
my $reseller = $self->reseller_by_id($c, $id);
last unless $self->resource_exists($c, reseller => $reseller);
my $old_resource = { $reseller->get_inflated_columns };
my $old_resource = $self->hal_from_reseller($c, $reseller, $form)->resource;
my $resource = $self->apply_patch($c, $old_resource, $json);
last unless $resource;
my $form = $self->get_form($c);
$reseller = $self->update_reseller($c, $reseller, $old_resource, $resource, $form);
last unless $reseller;
@ -153,9 +154,9 @@ sub PUT :Allow {
media_type => 'application/json',
);
last unless $resource;
my $old_resource = { $reseller->get_inflated_columns };
my $form = $self->get_form($c);
my $old_resource = $self->hal_from_reseller($c, $reseller, $form)->resource;
$reseller = $self->update_reseller($c, $reseller, $old_resource, $resource, $form);
last unless $reseller;

@ -0,0 +1,46 @@
package NGCP::Panel::Form::ResellerAPI;
use HTML::FormHandler::Moose;
extends 'NGCP::Panel::Form::Reseller';
use HTML::FormHandler::Widget::Block::Bootstrap;
has '+widget_wrapper' => ( default => 'Bootstrap' );
has_field 'submitid' => ( type => 'Hidden' );
sub build_render_list {[qw/submitid fields actions/]}
sub build_form_element_class { [qw/form-horizontal/] }
has_field 'enable_rtc' => (
type => 'Boolean',
required => 0,
default => 0,
element_attr => {
rel => ['tooltip'],
title => ['Whether an RTC-entity should be created for this reseller.'],
}
);
has_field 'rtc_networks' => (
type => 'Multiple', # Select
required => '0',
widget => 'CheckboxGroup',
options => [
{ value => 'sip', label => 'SIP Only' },
{ value => 'xmpp', label => 'XMPP Only' },
{ value => 'sipwise', label => 'SIP and XMPP' },
{ value => 'webrtc', label => 'WebRTC Only' },
],
element_attr => {
rel => ['tooltip'],
title => ['The RTC networks that should be preinitialized for this reseller.'],
}
);
has_block 'fields' => (
tag => 'div',
class => [qw/modal-body/],
render_list => [qw/contract name status enable_rtc rtc_networks/],
);
1;
# vim: set tabstop=4 expandtab:

@ -13,7 +13,7 @@ use Data::HAL qw();
use Data::HAL::Link qw();
use HTTP::Status qw(:constants);
use NGCP::Panel::Utils::DateTime;
use NGCP::Panel::Form::Reseller qw();
use NGCP::Panel::Form::ResellerAPI qw();
sub item_rs {
my ($self, $c) = @_;
@ -25,13 +25,18 @@ sub item_rs {
sub get_form {
my ($self, $c) = @_;
return NGCP::Panel::Form::Reseller->new;
return NGCP::Panel::Form::ResellerAPI->new;
}
sub hal_from_reseller {
my ($self, $c, $reseller, $form) = @_;
my %resource = $reseller->get_inflated_columns;
if ($reseller->rtc_user) {
$resource{enable_rtc} = JSON::true;
} else {
$resource{enable_rtc} = JSON::false;
}
# TODO: we should return the relations in embedded fields,
# if the structure is returned for one single item
@ -119,7 +124,16 @@ sub update_reseller {
}
}
$reseller->update($resource);
$reseller->update({
name => $resource->{name},
status => $resource->{status},
contract_id => $resource->{contract_id},
});
NGCP::Panel::Utils::Rtc::modify_reseller_rtc($old_resource, $resource, $c->config,
$reseller, sub {
$c->log->warn(shift); return;
});
# TODO: should we lock reseller admin logins if reseller gets terminated?
# or terminate all his customers and delete non-billing data?

@ -23,22 +23,9 @@ has 'host' => (is => 'rw', default => 'https://www.api-cdk.tld:8191');
has 'login_status' => (is => 'rw',
#isa => 'HTTP::Response',
default => sub {return {};},
);
sub mytest {
my $c = NGCP::Panel::Utils::ComxAPIClient->new(
host => 'https://rtcengine.sipwise.com/rtcengine/api',
);
$c->login('gjungwirth@sipwise', '***', 'rtcengine.sipwise.com:443');
#p $c->get_sessions;
#p $c->create_session_and_account('npa4V0YkavioQ1GW7Yob', 'sip', 'user1@bar.com', '123456', 'YAqON76yLVtgMgBYeg6v');
#p $c->create_session_and_account('npa4V0YkavioQ1GW7Yob', 'sip4', 'sip:alice@192.168.51.150', 'alicepass', 'YAqON76yLVtgMgBYeg6v');
#p $c->get_networks;
$c->create_network('sip', 'sip-connector', {xms => JSON::false}, 'YAqON76yLVtgMgBYeg6v');
print "done\n";
return;
}
# returns appid or 0
sub login {
my ( $self, $username, $password, $netloc ) = @_;
@ -90,6 +77,19 @@ sub create_network {
return $network;
}
sub create_user {
my ($self, $email, $password) = @_;
my $ua = $self->ua;
my $user_content = encode_json({
email => $email,
password => $password,
});
my $user = $self->_create_response(
$ua->post($self->host . '/users', 'Content-Type' => 'application/json', Content => $user_content),
);
return $user;
}
sub delete_network {
my ($self, $network_id) = @_;
my $ua = $self->ua;
@ -99,6 +99,24 @@ sub delete_network {
return $self->_create_response($resp);
}
sub delete_user {
my ($self, $user_id) = @_;
my $ua = $self->ua;
$user_id //= "";
my $resp;
$resp = $ua->delete($self->host . "/users/id/$user_id");
return $self->_create_response($resp);
}
sub delete_app {
my ($self, $app_id) = @_;
my $ua = $self->ua;
$app_id //= "";
my $resp;
$resp = $ua->delete($self->host . "/apps/id/$app_id");
return $self->_create_response($resp);
}
sub create_app {
my ($self, $name, $domain, $owner) = @_;
my $ua = $self->ua;

@ -0,0 +1,151 @@
package NGCP::Panel::Utils::Rtc;
use warnings;
use strict;
use JSON qw//;
use NGCP::Panel::Utils::ComxAPIClient;
sub modify_reseller_rtc {
my ($old_resource, $resource, $config, $reseller_item, $err_code) = @_;
if (!defined $err_code || ref $err_code ne 'CODE') {
$err_code = sub { return 0; };
}
if ((!defined $old_resource) && (defined $resource)) { # newly created reseller
# 1. enable_rtc is off -> do nothing
if (!$resource->{enable_rtc}) {
return;
}
_create_rtc_user($resource, $config, $reseller_item, $err_code);
} elsif ((defined $old_resource) && (defined $resource)) {
if($old_resource->{status} ne 'terminated' &&
$resource->{status} eq 'terminated' &&
$old_resource->{enable_rtc}) { # just terminated
$resource->{enable_rtc} = JSON::false;
_delete_rtc_user($config, $reseller_item, $err_code);
} elsif ($old_resource->{enable_rtc} &&
!$resource->{enable_rtc}) { # disable rtc
_delete_rtc_user($config, $reseller_item, $err_code);
} elsif (!$old_resource->{enable_rtc} &&
$resource->{enable_rtc} &&
$resource->{status} ne 'terminated') { # enable rtc
_create_rtc_user($resource, $config, $reseller_item, $err_code);
}
}
return;
}
sub _create_rtc_user {
my ($resource, $config, $reseller_item, $err_code) = @_;
my $rtc_networks = $resource->{rtc_networks} // [];
if ('ARRAY' ne (ref $rtc_networks)) {
$rtc_networks = [$rtc_networks];
}
# 2. create user w reseller-name and reseller-name _ "pass"
my $reseller_name = $resource->{name} =~ s/\s+//rg;
my $comx = NGCP::Panel::Utils::ComxAPIClient->new(
host => $config->{rtc}{schema}.'://'.
$config->{rtc}{host}.':'.$config->{rtc}{port}.
$config->{rtc}{path},
);
$comx->login(
$config->{rtc}{user},
$config->{rtc}{pass},
$config->{rtc}{host}.':'.$config->{rtc}{port});
if ($comx->login_status->{code} != 200) {
return unless &{$err_code}(
'Rtc Login failed. Check config settings.');
}
my $user = $comx->create_user(
$reseller_name . '@ngcp.com',
$reseller_name . 'pass12345',
);
if ($user->{code} != 201) {
return unless &{$err_code}(
'Creating rtc user failed. Error code: ' . $user->{code});
}
# 3. create relation in our db
$reseller_item->create_related('rtc_user', {
rtc_user_id => $user->{data}{id},
});
# 4. create related app
my $app = $comx->create_app(
$reseller_name . '_app',
$reseller_name . 'www.sipwise.com',
$user->{data}{id},
);
if ($app->{code} != 201) {
return unless &{$err_code}(
'Creating rtc app failed. Error code: ' . $app->{code});
}
# 5. create related networks
for my $n (@{ $rtc_networks }) {
my $n_response = $comx->create_network(
$reseller_name . "_$n",
$n . '-connector',
{xms => JSON::false},
$user->{data}{id},
);
if ($user->{code} != 201) {
return unless &{$err_code}(
'Creating rtc network failed. Error code: ' . $user->{code});
}
}
return;
}
sub _delete_rtc_user {
my ($config, $reseller_item, $err_code) = @_;
my $comx = NGCP::Panel::Utils::ComxAPIClient->new(
host => $config->{rtc}{schema}.'://'.
$config->{rtc}{host}.':'.$config->{rtc}{port}.
$config->{rtc}{path},
);
$comx->login(
$config->{rtc}{user},
$config->{rtc}{pass},
$config->{rtc}{host}.':'.$config->{rtc}{port});
if ($comx->login_status->{code} != 200) {
return unless &{$err_code}(
'Rtc Login failed. Check config settings.');
}
my $rtc_user = $reseller_item->rtc_user;
if (!defined $rtc_user) {
return unless &{$err_code}(
'No rtc user found in db for this reseller.');
}
# app and networks are deleted automatically
my $delete_resp = $comx->delete_user(
$rtc_user->rtc_user_id,
);
if ($delete_resp->{code} == 200) {
$rtc_user->delete;
} else {
return unless &{$err_code}(
'Deleting rtc user failed. Error code: ' . $delete_resp->{code});
}
return;
}
1;
# vim: set tabstop=4 expandtab:

@ -156,6 +156,15 @@ log4perl.appender.Default.layout.ConversionPattern=%d{ISO8601} [%p] [%F +%L] %m{
port 9200
</elasticsearch>
<rtc>
schema https
host rtcengine.sipwise.com
port 443
path /rtcengine/api
user gjungwirth@sipwise
pass 123456
</rtc>
<api_journal>
<billingprofiles>
operations create

@ -12,22 +12,65 @@ my $comx_netloc = $comx_host =~ s!^https://([^/:]*)(:[0-9]*)?/.*$!$1.($2||":443"
my $c = NGCP::Panel::Utils::ComxAPIClient->new(
host => $comx_host,
);
my $login_response = $c->login($comx_user, $comx_pass, $comx_netloc);
$c->login($comx_user, $comx_pass, $comx_netloc);
ok($c->login_status, "Login done");
is($c->login_status->{code}, 200, "Login successful");
#p $c->get_sessions;
#goto delete_u_only;
my $user = $c->create_user('foo@ngcptest.com', 'mypassabcdefg');
ok($user, "Create user");
is($user->{code}, 201, "Create user successful");
ok($user->{data}{id}, "Got a user id");
is(length($user->{data}{id}), 20, "User id follows format");
#p $c->get_sessions;
#p $c->create_session_and_account('npa4V0YkavioQ1GW7Yob', 'sip4', 'sip:alice@192.168.51.150', 'alicepass', 'YAqON76yLVtgMgBYeg6v');
#p $c->get_networks;
my $network = $c->create_network('gjungwirth_test', 'sip-connector', {xms => JSON::false}, 'YAqON76yLVtgMgBYeg6v');
ok($network, "Create Network");
is($network->{code}, 201, "Create Network successful");
ok($network->{data}{id}, "Got a network id");
is(length($network->{data}{id}), 20, "Network id follows format");
my $app = $c->create_app('gjungwirth_test_app', 'www.example.tld', $user->{data}{id});
ok($app, "Create App");
is($app->{code}, 201, "Create App successful");
ok($app->{data}{id}, "Got an app id");
is(length($app->{data}{id}), 20, "App id follows format");
########################
$c->login('foo@ngcptest.com', 'mypassabcdefg', $comx_netloc);
ok($c->login_status, "Login (as created user) done");
is($c->login_status->{code}, 200, "Login (as created user) successful");
my $network2 = $c->create_network('gjungwirth_test_as_subuser', 'sipwise-connector', {xms => JSON::false}, $user->{data}{id});
ok($network2, "Create Network (as subuser)");
is($network2->{code}, 201, "Create Network successful (as subuser)");
ok($network2->{data}{id}, "Got a network id (as subuser)");
my $tmp_resp = $c->delete_network($network2->{data}{id});
is($tmp_resp->{code}, 200, "Delete Network (as subuser)");
$c->login($comx_user, $comx_pass, $comx_netloc);
ok($c->login_status, "Login done (as original user)");
is($c->login_status->{code}, 200, "Login successful (as original user)");
########################
#p $c->create_session_and_account('npa4V0YkavioQ1GW7Yob', 'sip', 'user1@bar.com', '123456', 'YAqON76yLVtgMgBYeg6v');
my $tmp_resp = $c->delete_network($network->{data}{id});
$tmp_resp = $c->delete_network($network->{data}{id});
is($tmp_resp->{code}, 200, "Delete Network");
$tmp_resp = $c->delete_app($app->{data}{id});
is($tmp_resp->{code}, 200, "Delete App");
delete_u_only:
$tmp_resp = $c->delete_user($user->{data}{id});
is($tmp_resp->{code}, 200, "Delete User");
ok(1,"stub, done");
done_testing;
Loading…
Cancel
Save