Skip to content

Commit ef94a0f

Browse files
smartx-usmansmartx-usman
committed
Updated visibility data storage directory.
1 parent f20ce67 commit ef94a0f

File tree

4 files changed

+69
-62
lines changed

4 files changed

+69
-62
lines changed

‎Visibility-Agent/IOVisor/control_plane_tracing.py‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -178,39 +178,40 @@ def toHex(s):
178178
print (MESSAGE)
179179

180180
CurrentMin = int(time.strftime("%M"))
181+
BoxName=socket.gethostname()
181182

182183
if (CurrentMin < 30):
183184
if (CurrentMin < 10):
184185
if (CurrentMin < 5):
185-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-00"
186+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-00"
186187
else:
187-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-05"
188+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-05"
188189
elif (CurrentMin < 20):
189190
if (CurrentMin < 15):
190-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-10"
191+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-10"
191192
else:
192-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-15"
193+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-15"
193194
else:
194195
if (CurrentMin < 25):
195-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-20"
196+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-20"
196197
else:
197-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-25"
198+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-25"
198199
else:
199200
if (CurrentMin < 40):
200201
if (CurrentMin < 35):
201-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-30"
202+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-30"
202203
else:
203-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-35"
204+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-35"
204205
elif (CurrentMin < 50):
205206
if (CurrentMin < 45):
206-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-40"
207+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-40"
207208
else:
208-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-45"
209+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-45"
209210
else:
210211
if (CurrentMin < 55):
211-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-50"
212+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-50"
212213
else:
213-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-55"
214+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-55"
214215

215216
# f = open(filename, "wb")
216217
f = open(filename, "a")

‎Visibility-Agent/IOVisor/data_plane_tracing.py‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -172,39 +172,40 @@ def toHex(s):
172172
print (MESSAGE)
173173

174174
CurrentMin = int(time.strftime("%M"))
175+
BoxName=socket.gethostname()
175176

176177
if (CurrentMin < 30):
177178
if (CurrentMin < 10):
178179
if (CurrentMin < 5):
179-
filename = "/opt/IOVisor-Data/data-" + time.strftime("%Y-%m-%d-%H") + "-00"
180+
filename = "/opt/IOVisor-Data/"+BoxName+"-data-" + time.strftime("%Y-%m-%d-%H") + "-00"
180181
else:
181-
filename = "/opt/IOVisor-Data/data-" + time.strftime("%Y-%m-%d-%H") + "-05"
182+
filename = "/opt/IOVisor-Data/"+BoxName+"-data-" + time.strftime("%Y-%m-%d-%H") + "-05"
182183
elif (CurrentMin < 20):
183184
if (CurrentMin < 15):
184-
filename = "/opt/IOVisor-Data/data-" + time.strftime("%Y-%m-%d-%H") + "-10"
185+
filename = "/opt/IOVisor-Data/"+BoxName+"-data-" + time.strftime("%Y-%m-%d-%H") + "-10"
185186
else:
186-
filename = "/opt/IOVisor-Data/data-" + time.strftime("%Y-%m-%d-%H") + "-15"
187+
filename = "/opt/IOVisor-Data/"+BoxName+"-" + time.strftime("%Y-%m-%d-%H") + "-15"
187188
else:
188189
if (CurrentMin < 25):
189-
filename = "/opt/IOVisor-Data/data-" + time.strftime("%Y-%m-%d-%H") + "-20"
190+
filename = "/opt/IOVisor-Data/"+BoxName+"-data-" + time.strftime("%Y-%m-%d-%H") + "-20"
190191
else:
191-
filename = "/opt/IOVisor-Data/data-" + time.strftime("%Y-%m-%d-%H") + "-25"
192+
filename = "/opt/IOVisor-Data/"+BoxName+"-data-" + time.strftime("%Y-%m-%d-%H") + "-25"
192193
else:
193194
if (CurrentMin < 40):
194195
if (CurrentMin < 35):
195-
filename = "/opt/IOVisor-Data/data-" + time.strftime("%Y-%m-%d-%H") + "-30"
196+
filename = "/opt/IOVisor-Data/"+BoxName+"-data-" + time.strftime("%Y-%m-%d-%H") + "-30"
196197
else:
197-
filename = "/opt/IOVisor-Data/data-" + time.strftime("%Y-%m-%d-%H") + "-35"
198+
filename = "/opt/IOVisor-Data/"+BoxName+"-data-" + time.strftime("%Y-%m-%d-%H") + "-35"
198199
elif (CurrentMin < 50):
199200
if (CurrentMin < 45):
200-
filename = "/opt/IOVisor-Data/data-" + time.strftime("%Y-%m-%d-%H") + "-40"
201+
filename = "/opt/IOVisor-Data/"+BoxName+"-data-" + time.strftime("%Y-%m-%d-%H") + "-40"
201202
else:
202-
filename = "/opt/IOVisor-Data/data-" + time.strftime("%Y-%m-%d-%H") + "-45"
203+
filename = "/opt/IOVisor-Data/"+BoxName+"-data-" + time.strftime("%Y-%m-%d-%H") + "-45"
203204
else:
204205
if (CurrentMin < 55):
205-
filename = "/opt/IOVisor-Data/data-" + time.strftime("%Y-%m-%d-%H") + "-50"
206+
filename = "/opt/IOVisor-Data/"+BoxName+"-data-" + time.strftime("%Y-%m-%d-%H") + "-50"
206207
else:
207-
filename = "/opt/IOVisor-Data/data-" + time.strftime("%Y-%m-%d-%H") + "-55"
208+
filename = "/opt/IOVisor-Data/"+BoxName+"-data-" + time.strftime("%Y-%m-%d-%H") + "-55"
208209

209210
f = open(filename, "a")
210211
f.write("%s\n" % MESSAGE)

‎Visibility-Agent/IOVisor/management_plane_tracing.py‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -155,39 +155,40 @@ def toHex(s):
155155
print (MESSAGE)
156156

157157
CurrentMin = int(time.strftime("%M"))
158+
BoxName=socket.gethostname()
158159

159160
if (CurrentMin < 30):
160161
if (CurrentMin < 10):
161162
if (CurrentMin < 5):
162-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-00"
163+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-00"
163164
else:
164-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-05"
165+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-05"
165166
elif (CurrentMin < 20):
166167
if (CurrentMin < 15):
167-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-10"
168+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-10"
168169
else:
169-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-15"
170+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-15"
170171
else:
171172
if (CurrentMin < 25):
172-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-20"
173+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-20"
173174
else:
174-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-25"
175+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-25"
175176
else:
176177
if (CurrentMin < 40):
177178
if (CurrentMin < 35):
178-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-30"
179+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-30"
179180
else:
180-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-35"
181+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-35"
181182
elif (CurrentMin < 50):
182183
if (CurrentMin < 45):
183-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-40"
184+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-40"
184185
else:
185-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-45"
186+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-45"
186187
else:
187188
if (CurrentMin < 55):
188-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-50"
189+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-50"
189190
else:
190-
filename = "/opt/IOVisor-Data/mc-" + time.strftime("%Y-%m-%d-%H") + "-55"
191+
filename = "/opt/IOVisor-Data/"+BoxName+"-mc-" + time.strftime("%Y-%m-%d-%H") + "-55"
191192

192193
f = open(filename, "a")
193194
f.write("%s\n" % MESSAGE)

‎Visibility-Agent/IOVisor/transfer_iovisor_data.sh‎

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,16 @@
1313
VISIBILITY_CENTER_IP=
1414
VISIBILITY_CENTER_USER=
1515

16-
TARGETFOLDER=
16+
TARGETFOLDERDP='/home/netcs/IOVisor-Data/Data-Plane'
17+
TARGETFOLDERCP='/home/netcs/IOVisor-Data/Control-Plane'
18+
1719
SOURCEFOLDER='/opt/IOVisor-Data'
1820

1921
Minute="$(date +'%M')"
2022
Hour="$(date +'%H')"
2123
cDate="$(date +'%Y-%m-%d')"
2224

25+
host=`hostname`
2326
if [ "$Hour" -lt 10 ]
2427
then
2528
Hour="0$Hour"
@@ -33,68 +36,69 @@ if [ "$Minute" -eq 0 ]
3336
PREVIOUS_DAY="$(date +'%d')"
3437
PREVIOUS_DAY=$((PREVIOUS_DAY - 1))
3538
cDate="$(date +'%Y-%m')"
36-
PREVIOUS_FILE1="/opt/IOVisor-Data/mc-$cDate-$PREVIOUS_DAY-$PREVIOUS_HOUR-$PREVIOUS_MINUTE"
37-
PREVIOUS_FILE2="/opt/IOVisor-Data/data-$cDate-$PREVIOUS_DAY-$PREVIOUS_HOUR-$PREVIOUS_MINUTE"
39+
PREVIOUS_FILE1="/opt/IOVisor-Data/$host-mc-$cDate-$PREVIOUS_DAY-$PREVIOUS_HOUR-$PREVIOUS_MINUTE"
40+
PREVIOUS_FILE2="/opt/IOVisor-Data/$host-data-$cDate-$PREVIOUS_DAY-$PREVIOUS_HOUR-$PREVIOUS_MINUTE"
3841
elif [ "$Minute" -eq 5 ]
3942
then
4043
PREVIOUS_MINUTE=00
41-
PREVIOUS_FILE1="/opt/IOVisor-Data/mc-$cDate-$Hour-$PREVIOUS_MINUTE"
42-
PREVIOUS_FILE2="/opt/IOVisor-Data/data-$cDate-$Hour-$PREVIOUS_MINUTE"
44+
PREVIOUS_FILE1="/opt/IOVisor-Data/$host-mc-$cDate-$Hour-$PREVIOUS_MINUTE"
45+
PREVIOUS_FILE2="/opt/IOVisor-Data/$host-data-$cDate-$Hour-$PREVIOUS_MINUTE"
4346
elif [ "$Minute" -eq 10 ]
4447
then
4548
PREVIOUS_MINUTE=05
46-
PREVIOUS_FILE1="/opt/IOVisor-Data/mc-$cDate-$Hour-$PREVIOUS_MINUTE"
47-
PREVIOUS_FILE2="/opt/IOVisor-Data/data-$cDate-$Hour-$PREVIOUS_MINUTE"
49+
PREVIOUS_FILE1="/opt/IOVisor-Data/$host-mc-$cDate-$Hour-$PREVIOUS_MINUTE"
50+
PREVIOUS_FILE2="/opt/IOVisor-Data/$host-data-$cDate-$Hour-$PREVIOUS_MINUTE"
4851
elif [ "$Minute" -eq 15 ]
4952
then
5053
PREVIOUS_MINUTE=10
51-
PREVIOUS_FILE1="/opt/IOVisor-Data/mc-$cDate-$Hour-$PREVIOUS_MINUTE"
52-
PREVIOUS_FILE2="/opt/IOVisor-Data/data-$cDate-$Hour-$PREVIOUS_MINUTE"
54+
PREVIOUS_FILE1="/opt/IOVisor-Data/$host-mc-$cDate-$Hour-$PREVIOUS_MINUTE"
55+
PREVIOUS_FILE2="/opt/IOVisor-Data/$host-data-$cDate-$Hour-$PREVIOUS_MINUTE"
5356
elif [ "$Minute" -eq 20 ]
5457
then
5558
PREVIOUS_MINUTE=15
56-
PREVIOUS_FILE1="/opt/IOVisor-Data/mc-$cDate-$Hour-$PREVIOUS_MINUTE"
57-
PREVIOUS_FILE2="/opt/IOVisor-Data/data-$cDate-$Hour-$PREVIOUS_MINUTE"
59+
PREVIOUS_FILE1="/opt/IOVisor-Data/$host-mc-$cDate-$Hour-$PREVIOUS_MINUTE"
60+
PREVIOUS_FILE2="/opt/IOVisor-Data/$host-data-$cDate-$Hour-$PREVIOUS_MINUTE"
5861
elif [ "$Minute" -eq 25 ]
5962
then
6063
PREVIOUS_MINUTE=20
61-
PREVIOUS_FILE1="/opt/IOVisor-Data/mc-$cDate-$Hour-$PREVIOUS_MINUTE"
62-
PREVIOUS_FILE2="/opt/IOVisor-Data/data-$cDate-$Hour-$PREVIOUS_MINUTE"
64+
PREVIOUS_FILE1="/opt/IOVisor-Data/$host-mc-$cDate-$Hour-$PREVIOUS_MINUTE"
65+
PREVIOUS_FILE2="/opt/IOVisor-Data/$host-data-$cDate-$Hour-$PREVIOUS_MINUTE"
6366
elif [ "$Minute" -eq 30 ]
6467
then
6568
PREVIOUS_MINUTE=25
66-
PREVIOUS_FILE1="/opt/IOVisor-Data/mc-$cDate-$Hour-$PREVIOUS_MINUTE"
67-
PREVIOUS_FILE2="/opt/IOVisor-Data/data-$cDate-$Hour-$PREVIOUS_MINUTE"
69+
PREVIOUS_FILE1="/opt/IOVisor-Data/$host-mc-$cDate-$Hour-$PREVIOUS_MINUTE"
70+
PREVIOUS_FILE2="/opt/IOVisor-Data/$host-data-$cDate-$Hour-$PREVIOUS_MINUTE"
6871
elif [ "$Minute" -eq 35 ]
6972
then
7073
PREVIOUS_MINUTE=30
71-
PREVIOUS_FILE1="/opt/IOVisor-Data/mc-$cDate-$Hour-$PREVIOUS_MINUTE"
72-
PREVIOUS_FILE2="/opt/IOVisor-Data/data-$cDate-$Hour-$PREVIOUS_MINUTE"
74+
PREVIOUS_FILE1="/opt/IOVisor-Data/$host-mc-$cDate-$Hour-$PREVIOUS_MINUTE"
75+
PREVIOUS_FILE2="/opt/IOVisor-Data/$host-data-$cDate-$Hour-$PREVIOUS_MINUTE"
7376
elif [ "$Minute" -eq 40 ]
7477
then
7578
PREVIOUS_MINUTE=35
76-
PREVIOUS_FILE1="/opt/IOVisor-Data/mc-$cDate-$Hour-$PREVIOUS_MINUTE"
77-
PREVIOUS_FILE2="/opt/IOVisor-Data/data-$cDate-$Hour-$PREVIOUS_MINUTE"
79+
PREVIOUS_FILE1="/opt/IOVisor-Data/$host-mc-$cDate-$Hour-$PREVIOUS_MINUTE"
80+
PREVIOUS_FILE2="/opt/IOVisor-Data/$host-data-$cDate-$Hour-$PREVIOUS_MINUTE"
7881
elif [ "$Minute" -eq 45 ]
7982
then
8083
PREVIOUS_MINUTE=40
81-
PREVIOUS_FILE1="/opt/IOVisor-Data/mc-$cDate-$Hour-$PREVIOUS_MINUTE"
82-
PREVIOUS_FILE2="/opt/IOVisor-Data/data-$cDate-$Hour-$PREVIOUS_MINUTE"
84+
PREVIOUS_FILE1="/opt/IOVisor-Data/$host-mc-$cDate-$Hour-$PREVIOUS_MINUTE"
85+
PREVIOUS_FILE2="/opt/IOVisor-Data/$host-data-$cDate-$Hour-$PREVIOUS_MINUTE"
8386
elif [ "$Minute" -eq 50 ]
8487
then
8588
PREVIOUS_MINUTE=45
86-
PREVIOUS_FILE1="/opt/IOVisor-Data/mc-$cDate-$Hour-$PREVIOUS_MINUTE"
87-
PREVIOUS_FILE2="/opt/IOVisor-Data/data-$cDate-$Hour-$PREVIOUS_MINUTE"
89+
PREVIOUS_FILE1="/opt/IOVisor-Data/$host-mc-$cDate-$Hour-$PREVIOUS_MINUTE"
90+
PREVIOUS_FILE2="/opt/IOVisor-Data/$host-data-$cDate-$Hour-$PREVIOUS_MINUTE"
8891
elif [ "$Minute" -eq 55 ]
8992
then
9093
PREVIOUS_MINUTE=50
91-
PREVIOUS_FILE1="/opt/IOVisor-Data/mc-$cDate-$Hour-$PREVIOUS_MINUTE"
92-
PREVIOUS_FILE2="/opt/IOVisor-Data/data-$cDate-$Hour-$PREVIOUS_MINUTE"
94+
PREVIOUS_FILE1="/opt/IOVisor-Data/$host-mc-$cDate-$Hour-$PREVIOUS_MINUTE"
95+
PREVIOUS_FILE2="/opt/IOVisor-Data/$host-data-$cDate-$Hour-$PREVIOUS_MINUTE"
9396
fi
9497

9598
echo "$PREVIOUS_FILE1 $PREVIOUS_FILE2"
9699

97-
sshpass -p $PASS scp $PREVIOUS_FILE1 $PREVIOUS_FILE2 $VISIBILITY_CENTER_USER@$VISIBILITY_CENTER_IP:$TARGETFOLDER
100+
sshpass -p $PASS scp $PREVIOUS_FILE1 $VISIBILITY_CENTER_USER@$VISIBILITY_CENTER_IP:$TARGETFOLDERCP
101+
sshpass -p $PASS scp $PREVIOUS_FILE2 $VISIBILITY_CENTER_USER@$VISIBILITY_CENTER_IP:$TARGETFOLDERDP
98102
sleep 20
99103

100104
shopt -s extglob; set -H

0 commit comments

Comments
 (0)