Skip to content

Fix da importfromfile/ydu #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UBiqube-ydu merged 2 commits into from
Nov 26, 2021
Merged

Fix da importfromfile/ydu #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
623addf
auth_header can be unset in REST Generic DA
UBiqube-ydu Nov 26, 2021
60dc75e
MSA-10649 : fix IMPORTFROMFILE
UBiqube-ydu Nov 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 0 additions & 69 deletions adapters/a10_thunder/a10_thunder_command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,75 +99,6 @@ function eval_IMPORT() {
return SMS_OK;
}

/*
* #####################################################################################
* IMPORT FROM FILE
* #####################################################################################
*/
/**
* IMPORT configuration from router
*
* @param object $json_params
* parameters of the command
* @param domElement $element
* DOM element of the definition of the command
*/
function eval_IMPORTFROMFILE() {
global $sms_sd_ctx;
global $SMS_RETURN_BUF;

if (! empty($this->parser_list)) {
$objects = array();
// One operation groups several parsers
foreach ($this->parser_list as $operation => $parsers) {
$sub_list = array();
foreach ($parsers as $parser) {
$op_eval = $parser->eval_operation();
// Group parsers into evaluated operations
$sub_list["$op_eval"][] = $parser;
}

foreach ($sub_list as $op_eval => $sub_parsers) {
// Run evaluated operation
$running_conf = '';

foreach ($this->import_file_list as $import_file) {
echo "Reading file $import_file\n";
$running_conf .= file_get_contents($import_file);
}
// Apply concerned parsers
foreach ($sub_parsers as $parser) {
$parser->parse($running_conf, $objects);
}
}
}

$this->parsed_objects = $objects;

debug_object_conf($objects);
$SMS_RETURN_BUF .= object_to_json($objects);
}

return SMS_OK;
}

/**
* save parsed objects to database
*/
function apply_base_IMPORTFROMFILE($params) {
global $sms_csp;
global $sms_sd_info;

if (empty($params)) {
$ret = sms_bd_reset_conf_objects($sms_csp, $sms_sd_info);
if ($ret !== SMS_OK) {
return $ret;
}
}

return set_conf_object_to_db($this->parsed_objects);
}

/*
* #####################################################################################
* CREATE
Expand Down
76 changes: 0 additions & 76 deletions adapters/citrix_adc/citrix_adc_command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,82 +112,6 @@ function eval_IMPORT()
return SMS_OK;
}

/*
* #####################################################################################
* IMPORT FROM FILE
* #####################################################################################
*/
/**
* IMPORT configuration from router
* @param object $json_params JSON parameters of the command
* @param domElement $element XML DOM element of the definition of the command
*/
function eval_IMPORTFROMFILE()
{
global $sms_sd_ctx;
global $SMS_RETURN_BUF;

if (!empty($this->parser_list))
{
$objects = array();
// One operation groups several parsers
foreach ($this->parser_list as $operation => $parsers)
{
$sub_list = array();
foreach ($parsers as $parser)
{
$op_eval = $parser->eval_operation();
// Group parsers into evaluated operations
$sub_list["$op_eval"][] = $parser;
}

foreach ($sub_list as $op_eval => $sub_parsers)
{
// Run evaluated operation
$running_conf = '';

foreach ($this->import_file_list as $import_file)
{
echo "Reading file $import_file\n";
$running_conf .= file_get_contents($import_file);
}
// Apply concerned parsers
foreach ($sub_parsers as $parser)
{
$parser->parse($running_conf, $objects);
}
}
}

$this->parsed_objects = $objects;

debug_object_conf($objects);
$SMS_RETURN_BUF .= object_to_json($objects);
}

return SMS_OK;
}

/**
* save parsed objects to database
*/
function apply_base_IMPORTFROMFILE($params)
{
global $sms_csp;
global $sms_sd_info;

if (empty($params))
{
$ret = sms_bd_reset_conf_objects($sms_csp, $sms_sd_info);
if ($ret !== SMS_OK)
{
return $ret;
}
}

return set_conf_object_to_db($this->parsed_objects);
}

/*
* #####################################################################################
* CREATE
Expand Down
69 changes: 0 additions & 69 deletions adapters/f5_bigip/f5_bigip_command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,75 +99,6 @@ function eval_IMPORT() {
return SMS_OK;
}

/*
* #####################################################################################
* IMPORT FROM FILE
* #####################################################################################
*/
/**
* IMPORT configuration from router
*
* @param object $json_params
* parameters of the command
* @param domElement $element
* DOM element of the definition of the command
*/
function eval_IMPORTFROMFILE() {
global $sms_sd_ctx;
global $SMS_RETURN_BUF;

if (! empty ( $this->parser_list )) {
$objects = array ();
// One operation groups several parsers
foreach ( $this->parser_list as $operation => $parsers ) {
$sub_list = array ();
foreach ( $parsers as $parser ) {
$op_eval = $parser->eval_operation ();
// Group parsers into evaluated operations
$sub_list ["$op_eval"] [] = $parser;
}

foreach ( $sub_list as $op_eval => $sub_parsers ) {
// Run evaluated operation
$running_conf = '';

foreach ( $this->import_file_list as $import_file ) {
echo "Reading file $import_file\n";
$running_conf .= file_get_contents ( $import_file );
}
// Apply concerned parsers
foreach ( $sub_parsers as $parser ) {
$parser->parse ( $running_conf, $objects );
}
}
}

$this->parsed_objects = $objects;

debug_object_conf ( $objects );
$SMS_RETURN_BUF .= object_to_json ( $objects );
}

return SMS_OK;
}

/**
* save parsed objects to database
*/
function apply_base_IMPORTFROMFILE($params) {
global $sms_csp;
global $sms_sd_info;

if (empty ( $params )) {
$ret = sms_bd_reset_conf_objects ( $sms_csp, $sms_sd_info );
if ($ret !== SMS_OK) {
return $ret;
}
}

return set_conf_object_to_db ( $this->parsed_objects );
}

/*
* #####################################################################################
* CREATE
Expand Down
76 changes: 0 additions & 76 deletions adapters/juniper_srx/juniper_srx_command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,82 +111,6 @@ function eval_IMPORT()
return SMS_OK;
}

/*
* #####################################################################################
* IMPORT FROM FILE
* #####################################################################################
*/
/**
* IMPORT configuration from router
* @param object $json_params JSON parameters of the command
* @param domElement $element XML DOM element of the definition of the command
*/
function eval_IMPORTFROMFILE()
{
global $sms_sd_ctx;
global $SMS_RETURN_BUF;

if (!empty($this->parser_list))
{
$objects = array();
// One operation groups several parsers
foreach ($this->parser_list as $operation => $parsers)
{
$sub_list = array();
foreach ($parsers as $parser)
{
$op_eval = $parser->eval_operation();
// Group parsers into evaluated operations
$sub_list["$op_eval"][] = $parser;
}

foreach ($sub_list as $op_eval => $sub_parsers)
{
// Run evaluated operation
$running_conf = '';

foreach ($this->import_file_list as $import_file)
{
echo "Reading file $import_file\n";
$running_conf .= file_get_contents($import_file);
}
// Apply concerned parsers
foreach ($sub_parsers as $parser)
{
$parser->parse($running_conf, $objects);
}
}
}

$this->parsed_objects = $objects;

debug_object_conf($objects);
$SMS_RETURN_BUF .= object_to_json($objects);
}

return SMS_OK;
}

/**
* save parsed objects to database
*/
function apply_base_IMPORTFROMFILE($params)
{
global $sms_csp;
global $sms_sd_info;

if (empty($params))
{
$ret = sms_bd_reset_conf_objects($sms_csp, $sms_sd_info);
if ($ret !== SMS_OK)
{
return $ret;
}
}

return set_conf_object_to_db($this->parsed_objects);
}

/*
* #####################################################################################
* CREATE
Expand Down
5 changes: 4 additions & 1 deletion adapters/rest_generic/rest_generic_connect.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class DeviceConnection extends GenericConnection {
public $http_header_list;
public $protocol;
public $auth_mode;
public $auth_header;
public $conn_timeout;
public $fqdn;

Expand Down Expand Up @@ -102,7 +103,9 @@ public function send($origin, $rest_cmd) {
$auth = "";

echo("auth_mode= ".$this->auth_mode."\n");
echo("auth_header= ".$this->auth_header."\n");
if (isset($this->auth_header)) {
echo("auth_header= ".$this->auth_header."\n");
}
if (isset($this->key)) {
echo("key= ".$this->key."\n");
}
Expand Down
Loading