From 76cabcdea24cba8b73d11950e9b31fbe3d9167f3 Mon Sep 17 00:00:00 2001
From: Duquenoy <antoine.duquenoy@polytech-lille.net>
Date: Thu, 28 Feb 2019 20:36:00 +0100
Subject: [PATCH] Correction Ansible et programme C

---
 Ansible/ansible.yml |  6 +++---
 Serveur/main        | Bin 18088 -> 0 bytes
 Serveur/main.c      | 19 ++++++++++++-------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Ansible/ansible.yml b/Ansible/ansible.yml
index 4ec344c..7b62f29 100644
--- a/Ansible/ansible.yml
+++ b/Ansible/ansible.yml
@@ -20,7 +20,7 @@
 
   - name: "Copie du binaire pour le(s) capteur(s)"
     copy:
-      src: ~/pfe/files/{{ binary_dir }}/out.bin
+      src: ~/PFE_DEMO/files/{{ binary_dir }}/out.bin
       dest: /home/pi/{{ servernames }}/out.bin
 
   - name: "Copie du ficher de correspondance"
@@ -55,7 +55,7 @@
   - name: "Copie des résultats sur le serveur"
     fetch: 
       src: /home/pi/{{ servernames }}/res/{{ item }}
-      dest: /home/antoine/pfe_results/{{ servernames }}/{{ ansible_host  }}/
+      dest: ~/PFE_DEMO/results/{{ servernames }}/{{ ansible_host  }}/
       flat: yes
     with_items: "{{ files_to_copy.stdout_lines }}"   
 
@@ -64,6 +64,6 @@
 
   - name: "Suppression du fichier d'experimentation"
     file: 
-      path: "~/pfe/toflash/{{ servernames }}.yml.started" 
+      path: "~/PFE_DEMO/toflash/{{ exp_name }}.started" 
       state: absent
     delegate_to: 127.0.0.1
diff --git a/Serveur/main b/Serveur/main
index cd072be..22939b0 100755
Binary files a/Serveur/main and b/Serveur/main differ
diff --git a/Serveur/main.c b/Serveur/main.c
index 82fc7c4..954a69c 100644
--- a/Serveur/main.c
+++ b/Serveur/main.c
@@ -10,8 +10,9 @@
 #define MAX_SENSORS     8
 #define MAX_BUFFER      1024
 #define USERNAME        "antoine"
-#define FILES_PATH      "/home/antoine/pfe/files/"
-#define TOFLASH_PATH    "./toflash/"
+#define FILES_PATH      "/home/antoine/PFE_DEMO/files/"
+#define TOFLASH_PATH    "/home/antoine/PFE_DEMO/toflash/"
+#define PLAYBOOK_PATH	"/home/antoine/PFE_DEMO/ansible.yml"
 
 typedef struct node {
     char *ip;
@@ -28,6 +29,7 @@ typedef struct experiment {
     char *name;
     char *arch;
     char *dir;
+	char *exp_name;
     Node nodes[MAX_NODES];
 } Experiment;
 
@@ -139,9 +141,8 @@ Experiment *read_file(char *file_name) {
 int check_date(Experiment *experiment) {
     time_t now;
     time(&now);
-
     struct tm tm = { 0 };
-    strptime(experiment->date, "%Y-%m-%dT%H:M", &tm);
+    strptime(experiment->date, "%Y-%m-%dT%H:%M", &tm);
     time_t t = mktime(&tm);
 
     if(t <= now) {
@@ -224,12 +225,14 @@ int process_exp(Experiment *experiment) {
     fclose(hosts_fp);
 
     char ansible_command[512];
-    sprintf(ansible_command, "runuser -l %s -c \'ansible-playbook /home/antoine/pfe/ansible.yml -i %s -e \"servernames=exp_%d exp_duration=%d binary_dir=%s\"\'",
+    sprintf(ansible_command, "runuser -l %s -c \'ansible-playbook %s -i %s -e \"servernames=exp_%d exp_duration=%d binary_dir=%s exp_name=%s\"\'",
         USERNAME,
+	PLAYBOOK_PATH,
         hosts_filename,
         experiment->exp_id,
         time_sec,
-        experiment->dir);
+        experiment->dir,
+		experiment->exp_name);
     exec_prog_background(ansible_command);
 
     return 0;
@@ -238,7 +241,7 @@ int process_exp(Experiment *experiment) {
 void print_exp(Experiment *experiment) {
     printf("== EXP[%d] : %s ==\n%s during %s with the file %s (%s) on the %d nodes :\n",
         experiment->exp_id,
-        experiment->name,
+        experiment->exp_name,
         experiment->date,
         experiment->duration,
         experiment->file,
@@ -259,6 +262,7 @@ void free_exp(Experiment *experiment) {
     free(experiment->arch);
     free(experiment->dir);
     free(experiment->name);
+	free(experiment->exp_name);
     for(int i = 0; i < experiment->n_nodes; i++) {
         for(int j = 0; j < experiment->nodes[i].n_sensors; j++) {
             free(experiment->nodes[i].sensors[j]);
@@ -281,6 +285,7 @@ void check_files() {
                 strcpy(file_name, TOFLASH_PATH);
                 strcat(file_name, dirent->d_name);
                 Experiment *experiment = read_file(file_name);
+				experiment->exp_name = strdup(dirent->d_name);
 #ifdef DEBUG                
                 print_exp(experiment);
 #endif
--
libgit2 0.21.2