freewifi 0.2.9 → 0.2.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.idea/workspace.xml +105 -240
- data/lib/freewifi/general/wifi_portal_procedures.rb +33 -14
- data/lib/freewifi/mikrotik/newhub_mtik_api.rb +171 -74
- data/lib/freewifi/version.rb +1 -1
- data/lib/freewifi.rb +6 -2
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1788110b2b43c86164d08dfe35dab7580a89b6ee
|
|
4
|
+
data.tar.gz: 31b31f328a983306993aabecd845b5e907a6f1ba
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7a7ab2124a3ead1348cdc1897eceac8e089a1230d804a47ac01f42f0c2d4b992c86717fc55faf9907e1141e4cb3c4a957fafd795b01e971a56272a424b429920
|
|
7
|
+
data.tar.gz: 2860a28b7c1613f4146757a0d1bbb4b906d4f03f22e02e76d01d8c2e412325d217e24c402eceb457644d3304358f8762346453c628f6969ed5cf017fd4bca152
|
data/.idea/workspace.xml
CHANGED
|
@@ -5,50 +5,53 @@
|
|
|
5
5
|
</component>
|
|
6
6
|
<component name="ChangeListManager">
|
|
7
7
|
<list default="true" id="02df4d6c-c448-427d-afde-92139fadec23" name="Default" comment="">
|
|
8
|
-
<change
|
|
9
|
-
<change
|
|
10
|
-
<change
|
|
11
|
-
<change
|
|
12
|
-
<change
|
|
13
|
-
<change
|
|
14
|
-
<change
|
|
15
|
-
<change
|
|
16
|
-
<change
|
|
17
|
-
<change
|
|
18
|
-
<change
|
|
19
|
-
<change
|
|
20
|
-
<change
|
|
21
|
-
<change
|
|
22
|
-
<change
|
|
23
|
-
<change
|
|
24
|
-
<change
|
|
25
|
-
<change
|
|
26
|
-
<change
|
|
27
|
-
<change
|
|
28
|
-
<change
|
|
29
|
-
<change
|
|
30
|
-
<change
|
|
31
|
-
<change
|
|
32
|
-
<change
|
|
33
|
-
<change
|
|
34
|
-
<change
|
|
35
|
-
<change
|
|
36
|
-
<change
|
|
37
|
-
<change
|
|
38
|
-
<change
|
|
39
|
-
<change
|
|
40
|
-
<change
|
|
41
|
-
<change
|
|
42
|
-
<change
|
|
8
|
+
<change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
|
|
9
|
+
<change afterPath="$PROJECT_DIR$/.idea/freewifi.iml" afterDir="false" />
|
|
10
|
+
<change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
|
|
11
|
+
<change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
|
12
|
+
<change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
|
|
13
|
+
<change afterPath="$PROJECT_DIR$/.idea/runConfigurations/get_iwag_data.xml" afterDir="false" />
|
|
14
|
+
<change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
|
|
15
|
+
<change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
16
|
+
<change afterPath="$PROJECT_DIR$/.travis.yml" afterDir="false" />
|
|
17
|
+
<change afterPath="$PROJECT_DIR$/CODE_OF_CONDUCT.md" afterDir="false" />
|
|
18
|
+
<change afterPath="$PROJECT_DIR$/Gemfile" afterDir="false" />
|
|
19
|
+
<change afterPath="$PROJECT_DIR$/LICENSE.txt" afterDir="false" />
|
|
20
|
+
<change afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
|
|
21
|
+
<change afterPath="$PROJECT_DIR$/Rakefile" afterDir="false" />
|
|
22
|
+
<change afterPath="$PROJECT_DIR$/bin/console" afterDir="false" />
|
|
23
|
+
<change afterPath="$PROJECT_DIR$/bin/setup" afterDir="false" />
|
|
24
|
+
<change afterPath="$PROJECT_DIR$/freewifi.gemspec" afterDir="false" />
|
|
25
|
+
<change afterPath="$PROJECT_DIR$/lib/freewifi.rb" afterDir="false" />
|
|
26
|
+
<change afterPath="$PROJECT_DIR$/lib/freewifi/additional/additional_functions.rb" afterDir="false" />
|
|
27
|
+
<change afterPath="$PROJECT_DIR$/lib/freewifi/cisco/any/cisco_schemes_conf_gen.rb" afterDir="false" />
|
|
28
|
+
<change afterPath="$PROJECT_DIR$/lib/freewifi/cisco/iwag/get_iwag_data.rb" afterDir="false" />
|
|
29
|
+
<change afterPath="$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_database_worker.rb" afterDir="false" />
|
|
30
|
+
<change afterPath="$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_telnet_connector.rb" afterDir="false" />
|
|
31
|
+
<change afterPath="$PROJECT_DIR$/lib/freewifi/config.rb" afterDir="false" />
|
|
32
|
+
<change afterPath="$PROJECT_DIR$/lib/freewifi/database/mongo/mongoconnector.rb" afterDir="false" />
|
|
33
|
+
<change afterPath="$PROJECT_DIR$/lib/freewifi/database/mysql/database_methods_wifi.rb" afterDir="false" />
|
|
34
|
+
<change afterPath="$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb" afterDir="false" />
|
|
35
|
+
<change afterPath="$PROJECT_DIR$/lib/freewifi/huawei/hua_controller_class.rb" afterDir="false" />
|
|
36
|
+
<change afterPath="$PROJECT_DIR$/lib/freewifi/mikrotik/automation/get_data_ssh_fun.rb" afterDir="false" />
|
|
37
|
+
<change afterPath="$PROJECT_DIR$/lib/freewifi/mikrotik/getsubscribermikrotik.rb" afterDir="false" />
|
|
38
|
+
<change afterPath="$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_api.rb" afterDir="false" />
|
|
39
|
+
<change afterPath="$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_ssh.rb" afterDir="false" />
|
|
40
|
+
<change afterPath="$PROJECT_DIR$/lib/freewifi/mikrotik/schemes_conf_gen.rb" afterDir="false" />
|
|
41
|
+
<change afterPath="$PROJECT_DIR$/lib/freewifi/params.rb" afterDir="false" />
|
|
42
|
+
<change afterPath="$PROJECT_DIR$/lib/freewifi/version.rb" afterDir="false" />
|
|
43
43
|
</list>
|
|
44
|
-
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
45
|
-
<option name="TRACKING_ENABLED" value="true" />
|
|
46
44
|
<option name="SHOW_DIALOG" value="false" />
|
|
47
45
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
48
46
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
49
47
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
50
48
|
</component>
|
|
51
|
-
<component name="ChangesViewManager"
|
|
49
|
+
<component name="ChangesViewManager">
|
|
50
|
+
<option name="groupingKeys">
|
|
51
|
+
<option value="directory" />
|
|
52
|
+
<option value="module" />
|
|
53
|
+
</option>
|
|
54
|
+
</component>
|
|
52
55
|
<component name="CoverageDataManager">
|
|
53
56
|
<SUITE FILE_PATH="coverage/freewifi@additional_functions.coverage" NAME="additional_functions Coverage Results" MODIFIED="1588023723762" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/lib/freewifi/additional" MODULE_NAME="freewifi" />
|
|
54
57
|
<SUITE FILE_PATH="coverage/freewifi@ssh_mtik_2.coverage" NAME="ssh_mtik_2 Coverage Results" MODIFIED="1645285472334" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" MODULE_NAME="freewifi" />
|
|
@@ -62,101 +65,6 @@
|
|
|
62
65
|
<SUITE FILE_PATH="coverage/freewifi@hewhub_mtik_ssh.coverage" NAME="hewhub_mtik_ssh Coverage Results" MODIFIED="1587796347972" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/lib/freewifi/mikrotik" MODULE_NAME="freewifi" />
|
|
63
66
|
<SUITE FILE_PATH="coverage/freewifi@ssh_mtik_1.coverage" NAME="ssh_mtik_1 Coverage Results" MODIFIED="1645283687687" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" MODULE_NAME="freewifi" />
|
|
64
67
|
</component>
|
|
65
|
-
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
|
|
66
|
-
<component name="FileEditorManager">
|
|
67
|
-
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
68
|
-
<file leaf-file-name="freewifi.rb" pinned="false" current-in-tab="true">
|
|
69
|
-
<entry file="file://$PROJECT_DIR$/lib/freewifi.rb">
|
|
70
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
71
|
-
<state relative-caret-position="459">
|
|
72
|
-
<caret line="391" column="16" lean-forward="false" selection-start-line="391" selection-start-column="11" selection-end-line="391" selection-end-column="16" />
|
|
73
|
-
<folding />
|
|
74
|
-
</state>
|
|
75
|
-
</provider>
|
|
76
|
-
</entry>
|
|
77
|
-
</file>
|
|
78
|
-
<file leaf-file-name="wifi_portal_procedures.rb" pinned="false" current-in-tab="false">
|
|
79
|
-
<entry file="file://$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb">
|
|
80
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
81
|
-
<state relative-caret-position="-15535">
|
|
82
|
-
<caret line="12" column="2" lean-forward="false" selection-start-line="12" selection-start-column="2" selection-end-line="12" selection-end-column="2" />
|
|
83
|
-
<folding />
|
|
84
|
-
</state>
|
|
85
|
-
</provider>
|
|
86
|
-
</entry>
|
|
87
|
-
</file>
|
|
88
|
-
<file leaf-file-name="test_wifi1.rb" pinned="false" current-in-tab="false">
|
|
89
|
-
<entry file="file://$PROJECT_DIR$/test/test_wifi1.rb">
|
|
90
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
91
|
-
<state relative-caret-position="338">
|
|
92
|
-
<caret line="38" column="0" lean-forward="true" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
|
|
93
|
-
<folding />
|
|
94
|
-
</state>
|
|
95
|
-
</provider>
|
|
96
|
-
</entry>
|
|
97
|
-
</file>
|
|
98
|
-
<file leaf-file-name="version.rb" pinned="false" current-in-tab="false">
|
|
99
|
-
<entry file="file://$PROJECT_DIR$/lib/freewifi/version.rb">
|
|
100
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
101
|
-
<state relative-caret-position="45">
|
|
102
|
-
<caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
|
|
103
|
-
<folding />
|
|
104
|
-
</state>
|
|
105
|
-
</provider>
|
|
106
|
-
</entry>
|
|
107
|
-
</file>
|
|
108
|
-
<file leaf-file-name="freewifi.gemspec" pinned="false" current-in-tab="false">
|
|
109
|
-
<entry file="file://$PROJECT_DIR$/freewifi.gemspec">
|
|
110
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
111
|
-
<state relative-caret-position="645">
|
|
112
|
-
<caret line="43" column="47" lean-forward="false" selection-start-line="43" selection-start-column="47" selection-end-line="43" selection-end-column="47" />
|
|
113
|
-
<folding />
|
|
114
|
-
</state>
|
|
115
|
-
</provider>
|
|
116
|
-
</entry>
|
|
117
|
-
</file>
|
|
118
|
-
<file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
|
|
119
|
-
<entry file="file://$PROJECT_DIR$/Gemfile">
|
|
120
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
121
|
-
<state relative-caret-position="90">
|
|
122
|
-
<caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
|
|
123
|
-
<folding />
|
|
124
|
-
</state>
|
|
125
|
-
</provider>
|
|
126
|
-
</entry>
|
|
127
|
-
</file>
|
|
128
|
-
<file leaf-file-name="freewifi_test.rb" pinned="false" current-in-tab="false">
|
|
129
|
-
<entry file="file://$PROJECT_DIR$/test/freewifi_test.rb">
|
|
130
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
131
|
-
<state relative-caret-position="0">
|
|
132
|
-
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
133
|
-
<folding />
|
|
134
|
-
</state>
|
|
135
|
-
</provider>
|
|
136
|
-
</entry>
|
|
137
|
-
</file>
|
|
138
|
-
<file leaf-file-name="test.rb" pinned="false" current-in-tab="false">
|
|
139
|
-
<entry file="file://$PROJECT_DIR$/test/test.rb">
|
|
140
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
141
|
-
<state relative-caret-position="0">
|
|
142
|
-
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
143
|
-
<folding />
|
|
144
|
-
</state>
|
|
145
|
-
</provider>
|
|
146
|
-
</entry>
|
|
147
|
-
</file>
|
|
148
|
-
<file leaf-file-name="newhub_mtik_api.rb" pinned="false" current-in-tab="false">
|
|
149
|
-
<entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_api.rb">
|
|
150
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
151
|
-
<state relative-caret-position="150">
|
|
152
|
-
<caret line="10" column="20" lean-forward="false" selection-start-line="10" selection-start-column="20" selection-end-line="10" selection-end-column="20" />
|
|
153
|
-
<folding />
|
|
154
|
-
</state>
|
|
155
|
-
</provider>
|
|
156
|
-
</entry>
|
|
157
|
-
</file>
|
|
158
|
-
</leaf>
|
|
159
|
-
</component>
|
|
160
68
|
<component name="Git.Settings">
|
|
161
69
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
162
70
|
</component>
|
|
@@ -209,6 +117,7 @@
|
|
|
209
117
|
<option name="width" value="1440" />
|
|
210
118
|
<option name="height" value="834" />
|
|
211
119
|
</component>
|
|
120
|
+
<component name="ProjectId" id="25LLHtlZvStaf5oY52mj3fq7did" />
|
|
212
121
|
<component name="ProjectView">
|
|
213
122
|
<navigator currentView="ProjectPane" proportions="" version="1">
|
|
214
123
|
<flattenPackages />
|
|
@@ -291,9 +200,9 @@
|
|
|
291
200
|
<component name="PropertiesComponent">
|
|
292
201
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
293
202
|
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
294
|
-
<property name="settings.editor.selected.configurable" value="org.jetbrains.plugins.ruby.settings.RubyActiveModuleSdkConfigurable" />
|
|
295
203
|
<property name="project.settings.patched" value="true" />
|
|
296
204
|
<property name="run.code.analysis.last.selected.profile" value="pProject Default" />
|
|
205
|
+
<property name="settings.editor.selected.configurable" value="org.jetbrains.plugins.ruby.settings.RubyActiveModuleSdkConfigurable" />
|
|
297
206
|
</component>
|
|
298
207
|
<component name="RecentsManager">
|
|
299
208
|
<key name="MoveFile.RECENT_KEYS">
|
|
@@ -301,58 +210,27 @@
|
|
|
301
210
|
<recent name="$PROJECT_DIR$/lib/freewifi/mikrotik" />
|
|
302
211
|
</key>
|
|
303
212
|
</component>
|
|
304
|
-
<component name="RunDashboard">
|
|
305
|
-
<option name="ruleStates">
|
|
306
|
-
<list>
|
|
307
|
-
<RuleState>
|
|
308
|
-
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
|
|
309
|
-
</RuleState>
|
|
310
|
-
<RuleState>
|
|
311
|
-
<option name="name" value="StatusDashboardGroupingRule" />
|
|
312
|
-
</RuleState>
|
|
313
|
-
</list>
|
|
314
|
-
</option>
|
|
315
|
-
</component>
|
|
316
213
|
<component name="RunManager" selected="Ruby.test_wifi1">
|
|
317
|
-
<configuration default="false" name="test_wifi1" type="RubyRunConfigurationType" factoryName="Ruby" temporary="true">
|
|
318
|
-
<module name="freewifi" />
|
|
319
|
-
<RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
|
320
|
-
<RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/test" />
|
|
321
|
-
<RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
|
|
322
|
-
<RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
|
|
323
|
-
<RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
|
|
324
|
-
<envs />
|
|
325
|
-
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
|
|
326
|
-
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
|
327
|
-
<EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
|
|
328
|
-
<COVERAGE_PATTERN ENABLED="true">
|
|
329
|
-
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
|
|
330
|
-
</COVERAGE_PATTERN>
|
|
331
|
-
</EXTENSION>
|
|
332
|
-
<RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/test/test_wifi1.rb" />
|
|
333
|
-
<RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
|
|
334
|
-
<method />
|
|
335
|
-
</configuration>
|
|
336
214
|
<configuration default="true" type="CucumberRunConfigurationType" factoryName="Cucumber">
|
|
337
|
-
<predefined_log_file
|
|
338
|
-
<module name="" />
|
|
215
|
+
<predefined_log_file enabled="true" id="RUBY_CUCUMBER" />
|
|
339
216
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
|
340
217
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
|
|
341
218
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
|
|
342
219
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
|
|
343
220
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
|
|
344
|
-
<
|
|
345
|
-
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
|
|
221
|
+
<EXTENSION ID="BundlerRunConfigurationExtension" BUNDLE_MODE="DISABLE" bundleExecEnabled="false" />
|
|
346
222
|
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
|
347
|
-
<EXTENSION ID="RubyCoverageRunConfigurationExtension"
|
|
223
|
+
<EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov">
|
|
348
224
|
<COVERAGE_PATTERN ENABLED="true">
|
|
349
225
|
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
|
|
350
226
|
</COVERAGE_PATTERN>
|
|
351
227
|
</EXTENSION>
|
|
228
|
+
<EXTENSION ID="org.jetbrains.plugins.ruby.rails.run.RailsRunConfigurationExtension" SCRATCH_USE_RAILS_RUNNER="false" />
|
|
352
229
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*.feature" />
|
|
353
230
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
|
|
354
231
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
|
|
355
232
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
|
|
233
|
+
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPTS_PATHS" VALUE="" />
|
|
356
234
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_TAGS_FILTER" VALUE="" />
|
|
357
235
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_NAME_FILTER" VALUE="" />
|
|
358
236
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="CUCUMBER_ARGS" VALUE="--color -r features" />
|
|
@@ -365,42 +243,26 @@
|
|
|
365
243
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="CUCUMBER_RUNNER_PATH" VALUE="" />
|
|
366
244
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="USE_CUSTOM_RUNNER" VALUE="false" />
|
|
367
245
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="SETTINGS_VERSION" VALUE="2" />
|
|
368
|
-
<method />
|
|
369
|
-
</configuration>
|
|
370
|
-
<configuration default="true" type="JavaScriptTestRunnerJest" factoryName="Jest">
|
|
371
|
-
<node-interpreter value="project" />
|
|
372
|
-
<working-dir value="" />
|
|
373
|
-
<envs />
|
|
374
|
-
<scope-kind value="ALL" />
|
|
375
|
-
<method />
|
|
376
|
-
</configuration>
|
|
377
|
-
<configuration default="true" type="JavaScriptTestRunnerProtractor" factoryName="Protractor">
|
|
378
|
-
<config-file value="" />
|
|
379
|
-
<node-interpreter value="project" />
|
|
380
|
-
<envs />
|
|
381
|
-
<method />
|
|
382
|
-
</configuration>
|
|
383
|
-
<configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
|
|
384
|
-
<method />
|
|
246
|
+
<method v="2" />
|
|
385
247
|
</configuration>
|
|
386
248
|
<configuration default="true" type="RSpecRunConfigurationType" factoryName="RSpec">
|
|
387
|
-
<predefined_log_file
|
|
388
|
-
<module name="" />
|
|
249
|
+
<predefined_log_file enabled="true" id="RUBY_RSPEC" />
|
|
389
250
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
|
390
251
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
|
|
391
252
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
|
|
392
253
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
|
|
393
254
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
|
|
394
|
-
<
|
|
395
|
-
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
|
|
255
|
+
<EXTENSION ID="BundlerRunConfigurationExtension" BUNDLE_MODE="DISABLE" bundleExecEnabled="false" />
|
|
396
256
|
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
|
397
|
-
<EXTENSION ID="RubyCoverageRunConfigurationExtension"
|
|
257
|
+
<EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov">
|
|
398
258
|
<COVERAGE_PATTERN ENABLED="true">
|
|
399
259
|
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
|
|
400
260
|
</COVERAGE_PATTERN>
|
|
401
261
|
</EXTENSION>
|
|
262
|
+
<EXTENSION ID="org.jetbrains.plugins.ruby.rails.run.RailsRunConfigurationExtension" SCRATCH_USE_RAILS_RUNNER="false" />
|
|
402
263
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
|
|
403
264
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
|
|
265
|
+
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATHS" VALUE="" />
|
|
404
266
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
|
|
405
267
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
|
|
406
268
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="" />
|
|
@@ -412,93 +274,102 @@
|
|
|
412
274
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />
|
|
413
275
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />
|
|
414
276
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
|
|
415
|
-
<method />
|
|
277
|
+
<method v="2" />
|
|
416
278
|
</configuration>
|
|
417
279
|
<configuration default="true" type="RubyRunConfigurationType" factoryName="Ruby">
|
|
418
|
-
<module name="" />
|
|
419
280
|
<RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
|
420
281
|
<RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="" />
|
|
421
282
|
<RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
|
|
422
283
|
<RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
|
|
423
284
|
<RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
|
|
424
|
-
<
|
|
425
|
-
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
|
|
285
|
+
<EXTENSION ID="BundlerRunConfigurationExtension" BUNDLE_MODE="DISABLE" bundleExecEnabled="false" />
|
|
426
286
|
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
|
427
|
-
<EXTENSION ID="RubyCoverageRunConfigurationExtension"
|
|
287
|
+
<EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov">
|
|
428
288
|
<COVERAGE_PATTERN ENABLED="true">
|
|
429
289
|
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
|
|
430
290
|
</COVERAGE_PATTERN>
|
|
431
291
|
</EXTENSION>
|
|
292
|
+
<EXTENSION ID="org.jetbrains.plugins.ruby.rails.run.RailsRunConfigurationExtension" SCRATCH_USE_RAILS_RUNNER="false" />
|
|
432
293
|
<RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="" />
|
|
433
294
|
<RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
|
|
434
|
-
<method />
|
|
295
|
+
<method v="2" />
|
|
296
|
+
</configuration>
|
|
297
|
+
<configuration name="test_wifi1" type="RubyRunConfigurationType" factoryName="Ruby" temporary="true">
|
|
298
|
+
<module name="freewifi" />
|
|
299
|
+
<RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
|
300
|
+
<RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/test" />
|
|
301
|
+
<RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
|
|
302
|
+
<RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
|
|
303
|
+
<RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
|
|
304
|
+
<EXTENSION ID="BundlerRunConfigurationExtension" BUNDLE_MODE="AUTO" bundleExecEnabled="true" />
|
|
305
|
+
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
|
306
|
+
<EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov">
|
|
307
|
+
<COVERAGE_PATTERN ENABLED="true">
|
|
308
|
+
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
|
|
309
|
+
</COVERAGE_PATTERN>
|
|
310
|
+
</EXTENSION>
|
|
311
|
+
<EXTENSION ID="org.jetbrains.plugins.ruby.rails.run.RailsRunConfigurationExtension" SCRATCH_USE_RAILS_RUNNER="false" />
|
|
312
|
+
<RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/test/test_wifi1.rb" />
|
|
313
|
+
<RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
|
|
314
|
+
<method v="2" />
|
|
435
315
|
</configuration>
|
|
436
316
|
<configuration default="true" type="TestUnitRunConfigurationType" factoryName="Test::Unit/Shoulda/Minitest">
|
|
437
|
-
<predefined_log_file
|
|
438
|
-
<module name="" />
|
|
317
|
+
<predefined_log_file enabled="true" id="RUBY_TESTUNIT" />
|
|
439
318
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
|
440
319
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
|
|
441
320
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
|
|
442
321
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
|
|
443
322
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
|
|
444
|
-
<
|
|
445
|
-
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
|
|
323
|
+
<EXTENSION ID="BundlerRunConfigurationExtension" BUNDLE_MODE="DISABLE" bundleExecEnabled="false" />
|
|
446
324
|
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
|
447
|
-
<EXTENSION ID="RubyCoverageRunConfigurationExtension"
|
|
325
|
+
<EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov">
|
|
448
326
|
<COVERAGE_PATTERN ENABLED="true">
|
|
449
327
|
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
|
|
450
328
|
</COVERAGE_PATTERN>
|
|
451
329
|
</EXTENSION>
|
|
330
|
+
<EXTENSION ID="org.jetbrains.plugins.ruby.rails.run.RailsRunConfigurationExtension" SCRATCH_USE_RAILS_RUNNER="false" />
|
|
452
331
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
|
|
453
332
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
|
|
333
|
+
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPTS_PATHS" VALUE="" />
|
|
454
334
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="" />
|
|
455
335
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_METHOD_NAME" VALUE="" />
|
|
456
|
-
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="
|
|
336
|
+
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="CUSTOM_SET_OF_FILES" />
|
|
457
337
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="DRB" VALUE="false" />
|
|
458
338
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />
|
|
459
339
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />
|
|
460
340
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_OPTIONS" VALUE="" />
|
|
461
|
-
<method />
|
|
341
|
+
<method v="2" />
|
|
462
342
|
</configuration>
|
|
463
|
-
<configuration default="true" type="js.build_tools.gulp"
|
|
343
|
+
<configuration default="true" type="js.build_tools.gulp">
|
|
464
344
|
<node-interpreter>project</node-interpreter>
|
|
465
345
|
<node-options />
|
|
466
346
|
<gulpfile />
|
|
467
347
|
<tasks />
|
|
468
348
|
<arguments />
|
|
469
349
|
<envs />
|
|
470
|
-
<method />
|
|
350
|
+
<method v="2" />
|
|
471
351
|
</configuration>
|
|
472
|
-
<
|
|
473
|
-
<
|
|
474
|
-
<
|
|
475
|
-
<
|
|
476
|
-
<
|
|
477
|
-
<
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
<item
|
|
481
|
-
<item
|
|
482
|
-
<item
|
|
483
|
-
<item
|
|
484
|
-
<item index="4" class="java.lang.String" itemvalue="Ruby.wifi_portal_procedures" />
|
|
485
|
-
<item index="5" class="java.lang.String" itemvalue="Ruby.get_iwag_data" />
|
|
486
|
-
<item index="6" class="java.lang.String" itemvalue="Ruby.sql_delete_not_necc" />
|
|
487
|
-
<item index="7" class="java.lang.String" itemvalue="Ruby.test2" />
|
|
488
|
-
<item index="8" class="java.lang.String" itemvalue="Ruby.ssh_mtik_1" />
|
|
489
|
-
<item index="9" class="java.lang.String" itemvalue="Ruby.ssh_mtik_2" />
|
|
490
|
-
<item index="10" class="java.lang.String" itemvalue="Ruby.test_wifi1" />
|
|
352
|
+
<list>
|
|
353
|
+
<item itemvalue="Ruby.test_helper" />
|
|
354
|
+
<item itemvalue="Ruby.newhub_mtik_ssh" />
|
|
355
|
+
<item itemvalue="Ruby.test" />
|
|
356
|
+
<item itemvalue="Ruby.additional_functions" />
|
|
357
|
+
<item itemvalue="Ruby.wifi_portal_procedures" />
|
|
358
|
+
<item itemvalue="Ruby.get_iwag_data" />
|
|
359
|
+
<item itemvalue="Ruby.sql_delete_not_necc" />
|
|
360
|
+
<item itemvalue="Ruby.test2" />
|
|
361
|
+
<item itemvalue="Ruby.ssh_mtik_1" />
|
|
362
|
+
<item itemvalue="Ruby.ssh_mtik_2" />
|
|
363
|
+
<item itemvalue="Ruby.test_wifi1" />
|
|
491
364
|
</list>
|
|
492
365
|
<recent_temporary>
|
|
493
|
-
<list
|
|
494
|
-
<item
|
|
366
|
+
<list>
|
|
367
|
+
<item itemvalue="Ruby.test_wifi1" />
|
|
495
368
|
</list>
|
|
496
369
|
</recent_temporary>
|
|
497
370
|
</component>
|
|
498
|
-
<component name="
|
|
499
|
-
|
|
500
|
-
</component>
|
|
501
|
-
<component name="SpringUtil" SPRING_PRE_LOADER_OPTION="true" />
|
|
371
|
+
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
|
372
|
+
<component name="SpringUtil" SPRING_PRE_LOADER_OPTION="true" RAKE_SPRING_PRE_LOADER_OPTION="false" RAILS_SPRING_PRE_LOADER_OPTION="false" />
|
|
502
373
|
<component name="SvnConfiguration">
|
|
503
374
|
<configuration>$USER_HOME$/.subversion</configuration>
|
|
504
375
|
</component>
|
|
@@ -568,6 +439,7 @@
|
|
|
568
439
|
<workItem from="1645295265784" duration="23000" />
|
|
569
440
|
<workItem from="1645295326630" duration="743000" />
|
|
570
441
|
<workItem from="1645296175448" duration="895000" />
|
|
442
|
+
<workItem from="1645301337742" duration="327000" />
|
|
571
443
|
</task>
|
|
572
444
|
<servers />
|
|
573
445
|
</component>
|
|
@@ -599,14 +471,7 @@
|
|
|
599
471
|
</layout>
|
|
600
472
|
</component>
|
|
601
473
|
<component name="TypeScriptGeneratedFilesManager">
|
|
602
|
-
<option name="
|
|
603
|
-
</component>
|
|
604
|
-
<component name="VcsContentAnnotationSettings">
|
|
605
|
-
<option name="myLimit" value="2678400000" />
|
|
606
|
-
</component>
|
|
607
|
-
<component name="XDebuggerManager">
|
|
608
|
-
<breakpoint-manager />
|
|
609
|
-
<watches-manager />
|
|
474
|
+
<option name="version" value="3" />
|
|
610
475
|
</component>
|
|
611
476
|
<component name="editorHistoryManager">
|
|
612
477
|
<entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/getsubscribermikrotik.rb">
|
|
@@ -21,7 +21,9 @@ class WiFiPortal_1
|
|
|
21
21
|
:mtik_api_connector,
|
|
22
22
|
:hua_controller_connector,
|
|
23
23
|
:iwag_connector1,
|
|
24
|
-
:iwag_connector2
|
|
24
|
+
:iwag_connector2,
|
|
25
|
+
:protocol_mtik,
|
|
26
|
+
:mtik_capsman_list
|
|
25
27
|
|
|
26
28
|
def initialize(apigw_wsdl,
|
|
27
29
|
apigw_endpoint,
|
|
@@ -42,7 +44,9 @@ class WiFiPortal_1
|
|
|
42
44
|
iwag2_host,
|
|
43
45
|
iwag2_username,
|
|
44
46
|
iwag2_password,
|
|
45
|
-
iwag2_port
|
|
47
|
+
iwag2_port,
|
|
48
|
+
protocol_mtik,
|
|
49
|
+
mtik_capsman_list
|
|
46
50
|
)
|
|
47
51
|
@iwag_telnet_connector = CSRtelnet_1.new(iwag1_host, iwag1_username, iwag1_password)
|
|
48
52
|
@ard_api_gw_connector_wifi = Savon.client do
|
|
@@ -66,6 +70,8 @@ class WiFiPortal_1
|
|
|
66
70
|
@iwag_connector1 = IwagRequester.new(iwag1_host, iwag1_username, iwag1_password, iwag1_port)
|
|
67
71
|
@iwag_connector2 = IwagRequester.new(iwag2_host, iwag2_username, iwag2_password, iwag2_port)
|
|
68
72
|
|
|
73
|
+
@protocol_mtik = protocol_mtik
|
|
74
|
+
@mtik_capsman_list = mtik_capsman_list
|
|
69
75
|
end
|
|
70
76
|
|
|
71
77
|
|
|
@@ -250,15 +256,11 @@ class WiFiPortal_1
|
|
|
250
256
|
end
|
|
251
257
|
|
|
252
258
|
|
|
259
|
+
|
|
260
|
+
|
|
253
261
|
def get_subs_add_info4new_1(access_interface, subscribers_mac)
|
|
254
262
|
|
|
255
|
-
capsman_list =
|
|
256
|
-
"172.24.247.15",
|
|
257
|
-
"172.24.214.155",
|
|
258
|
-
"172.24.214.140",
|
|
259
|
-
"172.24.214.105",
|
|
260
|
-
"172.24.223.105"
|
|
261
|
-
]
|
|
263
|
+
capsman_list = mtik_capsman_list
|
|
262
264
|
|
|
263
265
|
answer = ""
|
|
264
266
|
|
|
@@ -271,11 +273,27 @@ class WiFiPortal_1
|
|
|
271
273
|
capsman_list.each do |capsman|
|
|
272
274
|
threads_mikro_wlc << Thread.new do
|
|
273
275
|
begin
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
276
|
+
if protocol_mtik == 'api'
|
|
277
|
+
p mikr_info5 = mtik_api_connector.get_info_subs_from_mik_1(subscribers_mac, capsman)
|
|
278
|
+
splitting5 = mikr_info5.split("---")
|
|
279
|
+
if splitting5[1] != "not on mikrotik controller" && splitting5[1]!="unknown" && splitting5[1]!=nil
|
|
280
|
+
answer = mikr_info5
|
|
281
|
+
p answer
|
|
282
|
+
end
|
|
283
|
+
elsif protocol_mtik == 'ssh'
|
|
284
|
+
p mikr_info5 = mtik_api_connector.get_info_subs_from_mik_ssh(subscribers_mac, capsman)
|
|
285
|
+
splitting5 = mikr_info5.split("---")
|
|
286
|
+
if splitting5[1] != "not on mikrotik controller" && splitting5[1]!="unknown" && splitting5[1]!=nil
|
|
287
|
+
answer = mikr_info5
|
|
288
|
+
p answer
|
|
289
|
+
end
|
|
290
|
+
else
|
|
291
|
+
p mikr_info5 = mtik_api_connector.get_info_subs_from_mik_1(subscribers_mac, capsman)
|
|
292
|
+
splitting5 = mikr_info5.split("---")
|
|
293
|
+
if splitting5[1] != "not on mikrotik controller" && splitting5[1]!="unknown" && splitting5[1]!=nil
|
|
294
|
+
answer = mikr_info5
|
|
295
|
+
p answer
|
|
296
|
+
end
|
|
279
297
|
end
|
|
280
298
|
rescue
|
|
281
299
|
p "thr0 wrong"
|
|
@@ -291,6 +309,7 @@ class WiFiPortal_1
|
|
|
291
309
|
answer
|
|
292
310
|
end
|
|
293
311
|
|
|
312
|
+
|
|
294
313
|
def proc_100_71_0_0(ip_address)
|
|
295
314
|
begin
|
|
296
315
|
p access_int = iwag_telnet_connector.return_iwag_access_interface_1(ip_address)
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
require 'mtik'
|
|
2
|
+
require 'net/ssh'
|
|
2
3
|
|
|
3
4
|
class NEWhubWifiApi_1
|
|
4
5
|
|
|
@@ -11,87 +12,183 @@ class NEWhubWifiApi_1
|
|
|
11
12
|
end
|
|
12
13
|
|
|
13
14
|
|
|
14
|
-
def get_info_subs_from_mik_1(subs_mac, controllers_ip)
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
15
|
+
def get_info_subs_from_mik_1(subs_mac, controllers_ip)
|
|
16
|
+
input_parameters = {:subs_mac => subs_mac, :controllers_ip => controllers_ip}
|
|
17
|
+
#region get additional information
|
|
18
|
+
|
|
19
|
+
subscribers_mac = subs_mac
|
|
20
|
+
access_point =""
|
|
21
|
+
ssid_ap =""
|
|
22
|
+
tx_rate_set = ""
|
|
23
|
+
tx_rate = ""
|
|
24
|
+
rx_rate = ""
|
|
25
|
+
rx_signal = ""
|
|
26
|
+
uptime = ""
|
|
27
|
+
packets = ""
|
|
28
|
+
bytes = ""
|
|
29
|
+
|
|
30
|
+
MTik::verbose = false
|
|
31
|
+
mikrot_connection1 = MTik::Connection.new :host => controllers_ip, :user => mtik_user, :pass => mtik_password, :conn_timeout => 7, :cmd_timeout => 7
|
|
32
|
+
mikrot_connection1.get_reply('/caps-man/registration-table/getall') do |req, sentence|
|
|
33
|
+
|
|
34
|
+
req.reply.each do |reply|
|
|
35
|
+
if reply.key?('mac-address')
|
|
36
|
+
#p reply
|
|
37
|
+
if reply['mac-address'] == subscribers_mac
|
|
38
|
+
|
|
39
|
+
access_point = reply['interface']
|
|
40
|
+
ssid_ap = reply['ssid']
|
|
41
|
+
tx_rate = reply['tx-rate']
|
|
42
|
+
rx_rate = reply['rx-rate']
|
|
43
|
+
rx_signal = reply['rx-signal']
|
|
44
|
+
uptime = reply['uptime']
|
|
45
|
+
packets = reply['packets']
|
|
46
|
+
bytes = reply['bytes']
|
|
47
|
+
tx_rate_set = reply['tx-rate-set']
|
|
48
|
+
end
|
|
47
49
|
end
|
|
48
50
|
end
|
|
49
51
|
end
|
|
50
|
-
end
|
|
51
52
|
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
53
|
+
if access_point=="" || ssid_ap=="" || packets==""
|
|
54
|
+
access_point = "not on mikrotik controller"
|
|
55
|
+
ssid_ap = "unknown"
|
|
56
|
+
tx_rate_set = "unknown"
|
|
57
|
+
tx_rate = "0"
|
|
58
|
+
rx_rate = "0"
|
|
59
|
+
rx_signal = "0"
|
|
60
|
+
uptime = "0"
|
|
61
|
+
packets = "0"
|
|
62
|
+
bytes = "0"
|
|
63
|
+
end
|
|
64
|
+
|
|
65
|
+
if access_point==nil
|
|
66
|
+
access_point= "unknown"
|
|
67
|
+
end
|
|
68
|
+
if ssid_ap==nil
|
|
69
|
+
ssid_ap= "unknown"
|
|
70
|
+
end
|
|
71
|
+
if tx_rate_set==nil
|
|
72
|
+
tx_rate_set= "unknown"
|
|
73
|
+
end
|
|
74
|
+
if tx_rate==nil
|
|
75
|
+
tx_rate= "unknown"
|
|
76
|
+
end
|
|
77
|
+
if rx_rate==nil
|
|
78
|
+
rx_rate= "unknown"
|
|
79
|
+
end
|
|
80
|
+
if rx_signal==nil
|
|
81
|
+
rx_signal= "unknown"
|
|
82
|
+
end
|
|
83
|
+
if uptime==nil
|
|
84
|
+
uptime= "unknown"
|
|
85
|
+
end
|
|
86
|
+
if packets==nil
|
|
87
|
+
packets= "unknown"
|
|
88
|
+
end
|
|
89
|
+
if bytes==nil
|
|
90
|
+
bytes= "unknown"
|
|
91
|
+
end
|
|
92
|
+
|
|
93
|
+
#endregion
|
|
94
|
+
subscribers_mac+ "---" + access_point + "---" + ssid_ap + "---" + tx_rate_set + "---"+ tx_rate + "---"+ rx_rate + "---"+ rx_signal + "---"+ uptime + "---"+ packets + "---"+ bytes
|
|
63
95
|
|
|
64
|
-
if access_point==nil
|
|
65
|
-
access_point= "unknown"
|
|
66
|
-
end
|
|
67
|
-
if ssid_ap==nil
|
|
68
|
-
ssid_ap= "unknown"
|
|
69
|
-
end
|
|
70
|
-
if tx_rate_set==nil
|
|
71
|
-
tx_rate_set= "unknown"
|
|
72
|
-
end
|
|
73
|
-
if tx_rate==nil
|
|
74
|
-
tx_rate= "unknown"
|
|
75
|
-
end
|
|
76
|
-
if rx_rate==nil
|
|
77
|
-
rx_rate= "unknown"
|
|
78
|
-
end
|
|
79
|
-
if rx_signal==nil
|
|
80
|
-
rx_signal= "unknown"
|
|
81
|
-
end
|
|
82
|
-
if uptime==nil
|
|
83
|
-
uptime= "unknown"
|
|
84
|
-
end
|
|
85
|
-
if packets==nil
|
|
86
|
-
packets= "unknown"
|
|
87
|
-
end
|
|
88
|
-
if bytes==nil
|
|
89
|
-
bytes= "unknown"
|
|
90
96
|
end
|
|
91
97
|
|
|
92
|
-
#endregion
|
|
93
|
-
subscribers_mac+ "---" + access_point + "---" + ssid_ap + "---" + tx_rate_set + "---"+ tx_rate + "---"+ rx_rate + "---"+ rx_signal + "---"+ uptime + "---"+ packets + "---"+ bytes
|
|
94
98
|
|
|
95
|
-
|
|
99
|
+
def get_info_subs_from_mik_ssh(subs_mac, controllers_ip)
|
|
100
|
+
input_parameters = {:subs_mac => subs_mac, :controllers_ip => controllers_ip}
|
|
101
|
+
#region get additional information
|
|
102
|
+
|
|
103
|
+
|
|
104
|
+
subscribers_mac = subs_mac
|
|
105
|
+
access_point =""
|
|
106
|
+
ssid_ap =""
|
|
107
|
+
tx_rate_set = ""
|
|
108
|
+
tx_rate = ""
|
|
109
|
+
rx_rate = ""
|
|
110
|
+
rx_signal = ""
|
|
111
|
+
uptime = ""
|
|
112
|
+
packets = ""
|
|
113
|
+
bytes = ""
|
|
114
|
+
|
|
115
|
+
begin
|
|
116
|
+
Net::SSH.start(controllers_ip, mtik_user, :password => mtik_password) do |ssh|
|
|
117
|
+
#result = ssh.exec!("/interface eoip print where tunnel-id=#{tunnel_id}")
|
|
118
|
+
#p result
|
|
119
|
+
result = ssh.exec!("/caps-man registration-table print detail value-list where mac-address=#{subs_mac}")
|
|
120
|
+
p result
|
|
121
|
+
access_point_reg = /interface:\s(.+)\r\n/
|
|
122
|
+
access_point = result.scan(access_point_reg)[0][0]
|
|
123
|
+
ssid_reg = /ssid:\s(.+)\r\n/
|
|
124
|
+
ssid_ap = result.scan(ssid_reg)[0][0]
|
|
125
|
+
|
|
126
|
+
tx_rate_set = "unknown"
|
|
127
|
+
tx_rate = "0"
|
|
128
|
+
rx_rate = "0"
|
|
129
|
+
rx_signal = "0"
|
|
130
|
+
uptime = "0"
|
|
131
|
+
packets = "0"
|
|
132
|
+
bytes = "0"
|
|
133
|
+
|
|
134
|
+
p access_point
|
|
135
|
+
p ssid_ap
|
|
136
|
+
#regimsi = /\s+name="(.+)"\s+/
|
|
137
|
+
#m1 = regimsi.match(result)[1]
|
|
138
|
+
|
|
139
|
+
#result2 = ssh.exec!("interface bridge port add bridge=#{bridge_name} interface=#{tunnel_name}")
|
|
140
|
+
end
|
|
141
|
+
#Net::SSH.stop
|
|
142
|
+
rescue
|
|
143
|
+
nil
|
|
144
|
+
end
|
|
145
|
+
|
|
146
|
+
p "1111111111111111111"
|
|
147
|
+
|
|
148
|
+
if access_point=="" || ssid_ap=="" || packets==""
|
|
149
|
+
access_point = "not on mikrotik controller"
|
|
150
|
+
ssid_ap = "unknown"
|
|
151
|
+
tx_rate_set = "unknown"
|
|
152
|
+
tx_rate = "0"
|
|
153
|
+
rx_rate = "0"
|
|
154
|
+
rx_signal = "0"
|
|
155
|
+
uptime = "0"
|
|
156
|
+
packets = "0"
|
|
157
|
+
bytes = "0"
|
|
158
|
+
end
|
|
159
|
+
|
|
160
|
+
if access_point==nil || access_point==''
|
|
161
|
+
access_point= "unknown"
|
|
162
|
+
end
|
|
163
|
+
if ssid_ap==nil || ssid_ap==''
|
|
164
|
+
ssid_ap= "unknown"
|
|
165
|
+
end
|
|
166
|
+
if tx_rate_set==nil || tx_rate_set==''
|
|
167
|
+
tx_rate_set= "unknown"
|
|
168
|
+
end
|
|
169
|
+
if tx_rate==nil || tx_rate==''
|
|
170
|
+
tx_rate= "unknown"
|
|
171
|
+
end
|
|
172
|
+
if rx_rate==nil || rx_rate==''
|
|
173
|
+
rx_rate= "unknown"
|
|
174
|
+
end
|
|
175
|
+
if rx_signal==nil || rx_signal==''
|
|
176
|
+
rx_signal= "unknown"
|
|
177
|
+
end
|
|
178
|
+
if uptime==nil || uptime==''
|
|
179
|
+
uptime= "unknown"
|
|
180
|
+
end
|
|
181
|
+
if packets==nil || packets==''
|
|
182
|
+
packets= "unknown"
|
|
183
|
+
end
|
|
184
|
+
if bytes==nil || bytes==''
|
|
185
|
+
bytes= "unknown"
|
|
186
|
+
end
|
|
187
|
+
|
|
188
|
+
#endregion
|
|
189
|
+
subscribers_mac+ "---" + access_point + "---" + ssid_ap + "---" + tx_rate_set + "---"+ tx_rate + "---"+ rx_rate + "---"+ rx_signal + "---"+ uptime + "---"+ packets + "---"+ bytes
|
|
190
|
+
|
|
191
|
+
end
|
|
192
|
+
|
|
96
193
|
|
|
97
194
|
end
|
data/lib/freewifi/version.rb
CHANGED
data/lib/freewifi.rb
CHANGED
|
@@ -303,7 +303,9 @@ class PortalFwifi_1
|
|
|
303
303
|
iwag2_username,
|
|
304
304
|
iwag2_password,
|
|
305
305
|
iwag1_port=22,
|
|
306
|
-
iwag2_port=22
|
|
306
|
+
iwag2_port=22,
|
|
307
|
+
protocol_mtik='api',
|
|
308
|
+
mtik_capsman_list=['172.24.247.15', '172.24.214.155', '172.24.214.140', '172.24.214.105', '172.24.223.105']
|
|
307
309
|
)
|
|
308
310
|
|
|
309
311
|
@general_procedures = WiFiPortal_1.new(apigw_wsdl,
|
|
@@ -325,7 +327,9 @@ class PortalFwifi_1
|
|
|
325
327
|
iwag2_host,
|
|
326
328
|
iwag2_username,
|
|
327
329
|
iwag2_password,
|
|
328
|
-
iwag2_port
|
|
330
|
+
iwag2_port,
|
|
331
|
+
protocol_mtik,
|
|
332
|
+
mtik_capsman_list
|
|
329
333
|
)
|
|
330
334
|
@mtik_control_ips_get = mtik_control_ips_get
|
|
331
335
|
@mtik_user = mtik_user
|