Remove old scripts for networkbench

software/monitor/buildout.hash.cfg

@@ -33,7 +33,4 @@ md5sum = b1ea718c10c9c9b56a86caa2d3320ed7
 filename = json-test-template.json.in.jinja2
 md5sum = 2eb5596544d9c341acf653d4f7ce2680
 
-[network-bench-cfg]
-filename = network_bench.cfg.in 
-md5sum = cfcbf2002b8eff5153e2bf68ed24b720
 

software/monitor/instance-monitor-edgetest.cfg.jinja2

@@ -108,13 +108,6 @@ command = cd ${monitor-directory:crawl-log}/{{ entry }} && ${crawler-bin:wrapper
 
 [monitor-directory]
 crawl-log = ${:srv}/crawlog
-network-user-logs = ${:private}/network-user-logs/
-{% for slave_instance in slave_instance_list -%}
-user-log-{{ slave_instance.get('slave_reference') }}-folder = ${:private}/network-user-logs/{{ slave_instance.get('slave_reference') }}
-user-log-{{ slave_instance.get('slave_reference') }}-ping-folder = ${:private}/network-user-logs/{{ slave_instance.get('slave_reference') }}/ping
-user-log-{{ slave_instance.get('slave_reference') }}-ping6-folder = ${:private}/network-user-logs/{{ slave_instance.get('slave_reference') }}/ping6
-
-{% endfor -%}
 {% for directory in directory_list %}
 {{ '%s = ${:crawl-log}/%s' % (directory, directory) }}
 {% endfor %}

software/monitor/network_bench.cfg.in

-[network_bench]
-
-{% if slapparameter_dict.get('test_distributor_url', '') not in ["", None] %}
-test_distributor_url = {{ slapparameter_dict.get('test_distributor_url', '') }}
-{% endif %}
-
-url =
-  {{ slapparameter_dict.get('test_http_url_list', '').split('\n') | join('\n  ') }}
-
-dns =
-  {{ slapparameter_dict.get('test_name_list', '').split('\n') | join('\n  ') }}
-
-ping =
-  {{ slapparameter_dict.get('ping_ip_list', '').split('\n') | join('\n  ') }}
-
-ping6 =
-  {{ slapparameter_dict.get('ping6_ip_list', '').split('\n') | join('\n  ') }}
\ No newline at end of file

software/monitor/software.cfg

@@ -11,7 +11,6 @@ extends =
 parts += 
   wget
   slapos-cookbook
-  network-bench-cfg
   json-test-template
   template
   template-monitor-edgetest
@@ -43,12 +42,6 @@ recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
 mode = 0644
 
-[network-bench-cfg]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/${:filename}
-output = ${buildout:parts-directory}/${:_buildout_section_name_}
-mode = 0644
-
 [extra-eggs]
 <= monitor-eggs
 interpreter = pythonwitheggs
@@ -60,7 +53,6 @@ eggs +=
   slapos.core
 
 scripts =
-  networkbench
   onetimedownload
   monitor.bootstrap
   monitor.genstatus