Code Review
/
sim
/
o1-interface.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add counters for generated notifications.
[sim/o1-interface.git]
/
ntsimulator
/
src
/
ntsimulator-manager
/
simulator-operations.c
diff --git
a/ntsimulator/src/ntsimulator-manager/simulator-operations.c
b/ntsimulator/src/ntsimulator-manager/simulator-operations.c
index
8520d2b
..
5f55f4e
100644
(file)
--- a/
ntsimulator/src/ntsimulator-manager/simulator-operations.c
+++ b/
ntsimulator/src/ntsimulator-manager/simulator-operations.c
@@
-92,8
+92,8
@@
static cJSON* get_docker_container_bindings(void)
curl_easy_reset(curl);
set_curl_common_info();
curl_easy_reset(curl);
set_curl_common_info();
- char url[
1
00];
- sprintf(url, "http:/v%s/containers/
NTS_Manager/json", getenv("DOCKER_ENGINE_VERSION
"));
+ char url[
2
00];
+ sprintf(url, "http:/v%s/containers/
%s/json", getenv("DOCKER_ENGINE_VERSION"), getenv("HOSTNAME
"));
curl_easy_setopt(curl, CURLOPT_URL, url);
curl_easy_setopt(curl, CURLOPT_URL, url);
@@
-253,6
+253,12
@@
static char* create_docker_container_curl(int base_netconf_port, cJSON* managerB
return NULL;
}
return NULL;
}
+ if (cJSON_AddStringToObject(labels, "NTS_Manager", getenv("HOSTNAME")) == NULL)
+ {
+ printf("Could not create JSON object: NTS Manager\n");
+ return NULL;
+ }
+
cJSON *env_variables_array = cJSON_CreateArray();
if (env_variables_array == NULL)
{
cJSON *env_variables_array = cJSON_CreateArray();
if (env_variables_array == NULL)
{
@@
-902,6
+908,12
@@
int stop_device(device_stack_t *theStack)
printf("Could not kill and remove docker container with uuid=\"%s\"\n", last_id);
}
printf("Could not kill and remove docker container with uuid=\"%s\"\n", last_id);
}
+ rc = removeDeviceEntryFromStatusFile(last_id);
+ if (rc != SR_ERR_OK)
+ {
+ printf("Could not remove entry from status file for uuid=\"%s\"\n", last_id);
+ }
+
pop_device(theStack);
return SR_ERR_OK;
pop_device(theStack);
return SR_ERR_OK;
@@
-1021,6
+1033,7
@@
int get_docker_containers_operational_state_curl(device_stack_t *theStack)
if (rc != SR_ERR_OK)
{
printf("Could not set the operational state for the device with uuid=\"%s\"\n", container_id_short);
if (rc != SR_ERR_OK)
{
printf("Could not set the operational state for the device with uuid=\"%s\"\n", container_id_short);
+ return SR_ERR_OPERATION_FAILED;
}
}
}
}
}
}
@@
-1092,7
+1105,7
@@
int notification_delay_period_changed(int period)
if (!cJSON_IsObject(notifConfig))
{
printf("Configuration JSON is not as expected: notification-config is not an object");
if (!cJSON_IsObject(notifConfig))
{
printf("Configuration JSON is not as expected: notification-config is not an object");
-
fre
e(jsonConfig);
+
cJSON_Delet
e(jsonConfig);
return SR_ERR_OPERATION_FAILED;
}
return SR_ERR_OPERATION_FAILED;
}
@@
-1100,7
+1113,7
@@
int notification_delay_period_changed(int period)
if (!cJSON_IsNumber(faultNotifDelay))
{
printf("Configuration JSON is not as expected: fault-notification-delay-period is not an object");
if (!cJSON_IsNumber(faultNotifDelay))
{
printf("Configuration JSON is not as expected: fault-notification-delay-period is not an object");
-
fre
e(jsonConfig);
+
cJSON_Delet
e(jsonConfig);
return SR_ERR_OPERATION_FAILED;
}
return SR_ERR_OPERATION_FAILED;
}
@@
-1111,7
+1124,7
@@
int notification_delay_period_changed(int period)
stringConfiguration = cJSON_Print(jsonConfig);
writeConfigFile(stringConfiguration);
stringConfiguration = cJSON_Print(jsonConfig);
writeConfigFile(stringConfiguration);
-
fre
e(jsonConfig);
+
cJSON_Delet
e(jsonConfig);
return SR_ERR_OK;
}
return SR_ERR_OK;
}
@@
-1145,7
+1158,7
@@
int ves_heartbeat_period_changed(int period)
if (!cJSON_IsObject(notifConfig))
{
printf("Configuration JSON is not as expected: notification-config is not an object");
if (!cJSON_IsObject(notifConfig))
{
printf("Configuration JSON is not as expected: notification-config is not an object");
-
fre
e(jsonConfig);
+
cJSON_Delet
e(jsonConfig);
return SR_ERR_OPERATION_FAILED;
}
return SR_ERR_OPERATION_FAILED;
}
@@
-1153,7
+1166,7
@@
int ves_heartbeat_period_changed(int period)
if (!cJSON_IsNumber(vesHeartbeatPeriod))
{
printf("Configuration JSON is not as expected: ves-heartbeat-period is not an object");
if (!cJSON_IsNumber(vesHeartbeatPeriod))
{
printf("Configuration JSON is not as expected: ves-heartbeat-period is not an object");
-
fre
e(jsonConfig);
+
cJSON_Delet
e(jsonConfig);
return SR_ERR_OPERATION_FAILED;
}
return SR_ERR_OPERATION_FAILED;
}
@@
-1164,7
+1177,7
@@
int ves_heartbeat_period_changed(int period)
stringConfiguration = cJSON_Print(jsonConfig);
writeConfigFile(stringConfiguration);
stringConfiguration = cJSON_Print(jsonConfig);
writeConfigFile(stringConfiguration);
-
fre
e(jsonConfig);
+
cJSON_Delet
e(jsonConfig);
return SR_ERR_OK;
}
return SR_ERR_OK;
}
@@
-1396,7
+1409,7
@@
int ves_ip_changed(char *new_ip)
if (!cJSON_IsObject(vesDetails))
{
printf("Configuration JSON is not as expected: ves-endpoint-details is not an object");
if (!cJSON_IsObject(vesDetails))
{
printf("Configuration JSON is not as expected: ves-endpoint-details is not an object");
-
fre
e(jsonConfig);
+
cJSON_Delet
e(jsonConfig);
return SR_ERR_OPERATION_FAILED;
}
return SR_ERR_OPERATION_FAILED;
}
@@
-1404,7
+1417,7
@@
int ves_ip_changed(char *new_ip)
if (!cJSON_IsString(vesIp))
{
printf("Configuration JSON is not as expected: ves-endpoint-ip is not a string");
if (!cJSON_IsString(vesIp))
{
printf("Configuration JSON is not as expected: ves-endpoint-ip is not a string");
-
fre
e(jsonConfig);
+
cJSON_Delet
e(jsonConfig);
return SR_ERR_OPERATION_FAILED;
}
return SR_ERR_OPERATION_FAILED;
}
@@
-1415,7
+1428,7
@@
int ves_ip_changed(char *new_ip)
stringConfiguration = cJSON_Print(jsonConfig);
writeConfigFile(stringConfiguration);
stringConfiguration = cJSON_Print(jsonConfig);
writeConfigFile(stringConfiguration);
-
fre
e(jsonConfig);
+
cJSON_Delet
e(jsonConfig);
return SR_ERR_OK;
}
return SR_ERR_OK;
}
@@
-1449,7
+1462,7
@@
int ves_port_changed(int new_port)
if (!cJSON_IsObject(vesDetails))
{
printf("Configuration JSON is not as expected: ves-endpoint-details is not an object");
if (!cJSON_IsObject(vesDetails))
{
printf("Configuration JSON is not as expected: ves-endpoint-details is not an object");
-
fre
e(jsonConfig);
+
cJSON_Delet
e(jsonConfig);
return SR_ERR_OPERATION_FAILED;
}
return SR_ERR_OPERATION_FAILED;
}
@@
-1457,7
+1470,7
@@
int ves_port_changed(int new_port)
if (!cJSON_IsNumber(vesPort))
{
printf("Configuration JSON is not as expected: ves-endpoint-port is not a number.");
if (!cJSON_IsNumber(vesPort))
{
printf("Configuration JSON is not as expected: ves-endpoint-port is not a number.");
-
fre
e(jsonConfig);
+
cJSON_Delet
e(jsonConfig);
return SR_ERR_OPERATION_FAILED;
}
return SR_ERR_OPERATION_FAILED;
}
@@
-1468,7
+1481,7
@@
int ves_port_changed(int new_port)
stringConfiguration = cJSON_Print(jsonConfig);
writeConfigFile(stringConfiguration);
stringConfiguration = cJSON_Print(jsonConfig);
writeConfigFile(stringConfiguration);
-
fre
e(jsonConfig);
+
cJSON_Delet
e(jsonConfig);
return SR_ERR_OK;
}
return SR_ERR_OK;
}
@@
-1502,7
+1515,7
@@
int ves_registration_changed(cJSON_bool new_bool)
if (!cJSON_IsObject(vesDetails))
{
printf("Configuration JSON is not as expected: ves-endpoint-details is not an object");
if (!cJSON_IsObject(vesDetails))
{
printf("Configuration JSON is not as expected: ves-endpoint-details is not an object");
-
fre
e(jsonConfig);
+
cJSON_Delet
e(jsonConfig);
return SR_ERR_OPERATION_FAILED;
}
return SR_ERR_OPERATION_FAILED;
}
@@
-1510,7
+1523,7
@@
int ves_registration_changed(cJSON_bool new_bool)
if (!cJSON_IsBool(vesRegistration))
{
printf("Configuration JSON is not as expected: ves-registration is not a bool.");
if (!cJSON_IsBool(vesRegistration))
{
printf("Configuration JSON is not as expected: ves-registration is not a bool.");
-
fre
e(jsonConfig);
+
cJSON_Delet
e(jsonConfig);
return SR_ERR_OPERATION_FAILED;
}
return SR_ERR_OPERATION_FAILED;
}
@@
-1521,7
+1534,7
@@
int ves_registration_changed(cJSON_bool new_bool)
stringConfiguration = cJSON_Print(jsonConfig);
writeConfigFile(stringConfiguration);
stringConfiguration = cJSON_Print(jsonConfig);
writeConfigFile(stringConfiguration);
-
fre
e(jsonConfig);
+
cJSON_Delet
e(jsonConfig);
return SR_ERR_OK;
}
return SR_ERR_OK;
}
@@
-1555,7
+1568,7
@@
int is_netconf_available_changed(cJSON_bool new_bool)
if (!cJSON_IsObject(notifConfig))
{
printf("Configuration JSON is not as expected: notification-config is not an object");
if (!cJSON_IsObject(notifConfig))
{
printf("Configuration JSON is not as expected: notification-config is not an object");
-
fre
e(jsonConfig);
+
cJSON_Delet
e(jsonConfig);
return SR_ERR_OPERATION_FAILED;
}
return SR_ERR_OPERATION_FAILED;
}
@@
-1563,7
+1576,7
@@
int is_netconf_available_changed(cJSON_bool new_bool)
if (!cJSON_IsBool(isNetconfAvailable))
{
printf("Configuration JSON is not as expected: is-netconf-available is not a bool.");
if (!cJSON_IsBool(isNetconfAvailable))
{
printf("Configuration JSON is not as expected: is-netconf-available is not a bool.");
-
fre
e(jsonConfig);
+
cJSON_Delet
e(jsonConfig);
return SR_ERR_OPERATION_FAILED;
}
return SR_ERR_OPERATION_FAILED;
}
@@
-1574,7
+1587,7
@@
int is_netconf_available_changed(cJSON_bool new_bool)
stringConfiguration = cJSON_Print(jsonConfig);
writeConfigFile(stringConfiguration);
stringConfiguration = cJSON_Print(jsonConfig);
writeConfigFile(stringConfiguration);
-
fre
e(jsonConfig);
+
cJSON_Delet
e(jsonConfig);
return SR_ERR_OK;
}
return SR_ERR_OK;
}
@@
-1608,7
+1621,7
@@
int is_ves_available_changed(cJSON_bool new_bool)
if (!cJSON_IsObject(notifConfig))
{
printf("Configuration JSON is not as expected: notification-config is not an object");
if (!cJSON_IsObject(notifConfig))
{
printf("Configuration JSON is not as expected: notification-config is not an object");
-
fre
e(jsonConfig);
+
cJSON_Delet
e(jsonConfig);
return SR_ERR_OPERATION_FAILED;
}
return SR_ERR_OPERATION_FAILED;
}
@@
-1616,7
+1629,7
@@
int is_ves_available_changed(cJSON_bool new_bool)
if (!cJSON_IsBool(isVesAvailable))
{
printf("Configuration JSON is not as expected: is-ves-available is not a bool.");
if (!cJSON_IsBool(isVesAvailable))
{
printf("Configuration JSON is not as expected: is-ves-available is not a bool.");
-
fre
e(jsonConfig);
+
cJSON_Delet
e(jsonConfig);
return SR_ERR_OPERATION_FAILED;
}
return SR_ERR_OPERATION_FAILED;
}
@@
-1627,7
+1640,7
@@
int is_ves_available_changed(cJSON_bool new_bool)
stringConfiguration = cJSON_Print(jsonConfig);
writeConfigFile(stringConfiguration);
stringConfiguration = cJSON_Print(jsonConfig);
writeConfigFile(stringConfiguration);
-
fre
e(jsonConfig);
+
cJSON_Delet
e(jsonConfig);
return SR_ERR_OK;
}
return SR_ERR_OK;
}