From 8f8e4df650c6bd7ebe7a7a5324438c9470ccf565 Mon Sep 17 00:00:00 2001 From: Ryan Cross Date: Fri, 15 Apr 2016 12:45:39 +0000 Subject: [PATCH] changes for demo - Legacy-Id: 11121 --- ietf/meeting/forms.py | 12 +- ietf/meeting/tests_js.py | 19 +++ ietf/meeting/urls.py | 2 +- ietf/meeting/views.py | 22 +++- .../static/ietf/js/meeting-interim-request.js | 118 +++++++++++++++++- ietf/templates/meeting/interim_request.html | 50 +++++--- test/.gitignore | 3 +- test/data/.gitignore | 1 + test/data/draft-aliases | 50 -------- test/data/draft-virtual | 50 -------- test/data/group-aliases | 50 -------- test/data/group-virtual | 50 -------- 12 files changed, 196 insertions(+), 231 deletions(-) create mode 100644 test/data/.gitignore delete mode 100644 test/data/draft-aliases delete mode 100644 test/data/draft-virtual delete mode 100644 test/data/group-aliases delete mode 100644 test/data/group-virtual diff --git a/ietf/meeting/forms.py b/ietf/meeting/forms.py index 45a53188a..fd2f9e4c1 100644 --- a/ietf/meeting/forms.py +++ b/ietf/meeting/forms.py @@ -140,7 +140,8 @@ class InterimRequestForm(forms.Form): group = GroupModelChoiceField(queryset = Group.objects.filter(type__in=('wg','rg'),state='active').order_by('acronym')) face_to_face = forms.BooleanField(required=False) meeting_type = forms.ChoiceField(choices=(("single", "Single"), ("multi-day", "Multi-Day"), ('series','Series')), required=False, initial='single', widget=forms.RadioSelect) - + approved = forms.BooleanField(required=False) + def __init__(self, request, *args, **kwargs): super(InterimRequestForm, self).__init__(*args, **kwargs) self.user = request.user @@ -169,9 +170,10 @@ class InterimRequestForm(forms.Form): class InterimSessionForm(forms.Form): date = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label='Date', required=True) time = forms.TimeField() - utc_time = forms.TimeField() + time_utc = forms.TimeField(required=False) duration = DurationField() - end_time = forms.TimeField() + end_time = forms.TimeField(required=False) + end_time_utc = forms.TimeField(required=False) remote_instructions = forms.CharField(max_length=1024,required=False) agenda = forms.CharField(required=False,widget=forms.Textarea) agenda_note = forms.CharField(max_length=255,required=False) @@ -179,6 +181,10 @@ class InterimSessionForm(forms.Form): country = forms.ChoiceField(choices=countries,required=False) timezone = forms.ChoiceField(choices=timezones) + def __init__(self, *args, **kwargs): + super(InterimSessionForm, self).__init__(*args, **kwargs) + self.fields['timezone'].initial = 'UTC' + def _save_agenda(self, text): pass diff --git a/ietf/meeting/tests_js.py b/ietf/meeting/tests_js.py index 103f56a17..0f2b284c5 100644 --- a/ietf/meeting/tests_js.py +++ b/ietf/meeting/tests_js.py @@ -73,6 +73,25 @@ class ScheduleEditTests(StaticLiveServerTestCase): time.sleep(0.1) # The API that modifies the database runs async self.assertEqual(SchedTimeSessAssignment.objects.filter(session__meeting__number=42,session__group__acronym='mars').count(),0) +@skipIf(skip_selenium, skip_message) +class InterimRequestTests(StaticLiveServerTestCase): + def setUp(self): + condition_data() + self.driver = webdriver.PhantomJS(service_log_path=settings.TEST_GHOSTDRIVER_LOG_PATH) + self.driver.set_window_size(1024,768) + + def absreverse(self,*args,**kwargs): + return '%s%s'%(self.live_server_url,urlreverse(*args,**kwargs)) + + def testInterimRequest(self): + url = self.absreverse('ietf.meeting.views.interim_request') + self.driver.get(url) + element = self.driver.find_element_by_id('id_form-0-date') + self.assertTrue(element) + + def testJustSitThere(self): + time.sleep(10000) + # The following are useful debugging tools # If you add this to a LiveServerTestCase and run just this test, you can browse diff --git a/ietf/meeting/urls.py b/ietf/meeting/urls.py index 38e335ff6..4be559919 100644 --- a/ietf/meeting/urls.py +++ b/ietf/meeting/urls.py @@ -58,6 +58,7 @@ type_ietf_only_patterns_id_optional = [ urlpatterns = [ # TODO - views.material should take num instead of meeting_num so it can move into one of the above lists + url(r'^ajax/get-utc/$', views.ajax_get_utc), url(r'^(?P\d+)/materials(?:.html)?/?$', views.materials), url(r'^requests.html$', RedirectView.as_view(url='/meeting/requests', permanent=True)), url(r'^(?P\d+)/requests.html$', RedirectView.as_view(url='/meeting/%(num)s/requests', permanent=True)), @@ -71,4 +72,3 @@ urlpatterns = [ url(r'^$', views.current_materials), ] - diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index bebbb0d29..a05f661d5 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -9,6 +9,7 @@ from tempfile import mkstemp from collections import OrderedDict, Counter import csv import json +import pytz import debug # pyflakes:ignore @@ -890,6 +891,23 @@ def session_details(request, num, acronym ): 'type_counter': type_counter, }) +# ------------------------------------------------- +# Interim Views +# ------------------------------------------------- + +def ajax_get_utc(request): + '''Ajax view that takes arguments time and timezone and returns UTC''' + time = request.GET.get('time') + timezone = request.GET.get('timezone') + hour,minute = time.split(':') + dt = datetime.datetime(2016,1,1,int(hour),int(minute)) + tz = pytz.timezone(timezone) + aware_dt = tz.localize(dt, is_dst=None) + utc_dt = aware_dt.astimezone(pytz.utc) + utc = utc_dt.strftime('%H:%M') + context_data = {'timezone':timezone,'time':time,'utc':utc} + return HttpResponse(json.dumps(context_data),content_type='application/json') + @role_required('Area Director','Secretariat','IRTF Chair','WG Chair') def interim_request(request): '''View for requesting an interim meeting''' @@ -917,7 +935,7 @@ def interim_request(request): else: assert False, (form.errors, formset.errors) else: - form = InterimRequestForm(request=request,initial={'meeting_type':'single'}) + form = InterimRequestForm(request=request,initial={'meeting_type':'single','timezone':'UTC'}) formset = SessionFormset() return render(request, "meeting/interim_request.html", {"form":form, "formset":formset}) @@ -925,7 +943,7 @@ def interim_request(request): def ical_upcoming(request): '''ICAL upcoming meetings''' today = datetime.datetime.today() - meetings = Meeting.objects.filter(date__gt=today) + meetings = Meeting.objects.filter(date__gt=today) return render(request, "meeting/upcoming.ics", { "meetings": meetings, diff --git a/ietf/static/ietf/js/meeting-interim-request.js b/ietf/static/ietf/js/meeting-interim-request.js index 43e8aa4ef..0e81f8b86 100644 --- a/ietf/static/ietf/js/meeting-interim-request.js +++ b/ietf/static/ietf/js/meeting-interim-request.js @@ -9,9 +9,16 @@ var interimRequest = { // bind functions $('.select2-field').select2(); $('#add_session').click(interimRequest.addSession); + $('.btn-delete').click(interimRequest.deleteSession); $('#id_face_to_face').change(interimRequest.toggleLocation); $('input[name="meeting_type"]').change(interimRequest.checkAddButton); - // init + $('input[name$="-duration"]').blur(interimRequest.calculateEndTime); + $('input[name$="-time"]').blur(interimRequest.calculateEndTime); + //$('input[name$="-time"]').blur(interimRequest.setUTC); + $('input[name$="-time"]').blur(interimRequest.updateInfo); + $('input[name$="-end_time"]').change(interimRequest.updateInfo); + $('select[name$="-timezone"]').change(interimRequest.timezoneChange); + // init interimRequest.faceToFace.each(interimRequest.toggleLocation); interimRequest.checkAddButton(); }, @@ -46,19 +53,69 @@ var interimRequest = { setupSelect2Field($(this)); }); - if(interimRequest.faceToFace.prop('checked')){ + //if(interimRequest.faceToFace.prop('checked')){ var first_session = $(".fieldset:first"); el.find("input[name$='city']").val(first_session.find("input[name$='city']").val()); el.find("select[name$='country']").val(first_session.find("select[name$='country']").val()); el.find("select[name$='timezone']").val(first_session.find("select[name$='timezone']").val()); - } + //} if(meeting_type == 'multi-day'){ el.find(".location").prop('disabled', true); } - + + $('.btn-delete').removeClass("hidden"); }, + updateInfo : function() { + //var url = liaisonForm.form.data("ajaxInfoUrl"); + //alert('called update'); + var url = "/meeting/ajax/get-utc"; + var fieldset = $(this).parents(".fieldset"); + var time = $(this).val(); + var timezone_field = fieldset.find('[name$="timezone"]'); + var timezone = timezone_field.val(); + var name = $(this).attr("id") + "_utc"; + var utc = fieldset.find("#" + name); + $.ajax({ + url: url, + type: 'GET', + cache: false, + async: true, + dataType: 'json', + data: {time: time, + timezone: timezone}, + success: function(response){ + if (!response.error) { + utc.val(response.utc + " UTC"); + } + } + }); + return false; + }, + + + calculateEndTime : function() { + // gets called when either start_time or duration change + var fieldset = $(this).parents(".fieldset"); + var start_time = fieldset.find("input[name$='-time']"); + var end_time = fieldset.find("input[name$='-end_time']"); + var duration = fieldset.find("input[name$='-duration']"); + if(!start_time.val() || !duration.val()){ + return; + } + var start_values = start_time.val().split(":"); + var duration_values = duration.val().split(":"); + var d = new Date(2000,1,1,start_values[0],start_values[1]); + var d1 = new Date(d.getTime() + (duration_values[0]*60*60*1000)); + var d2 = new Date(d1.getTime() + (duration_values[1]*60*1000)); + end_time.val(interimRequest.get_formatted_time(d2)); + end_time.trigger('change'); + //interimRequest.updateInfo(end_time); + //alert( d2 ); + //alert( end_time.attr("id") ); + }, + checkAddButton : function() { var meeting_type = $('input[name="meeting_type"]:checked').val(); if(meeting_type == 'single'){ @@ -68,6 +125,59 @@ var interimRequest = { } }, + get_formatted_time : function (d) { + // returns time from Date object as HH:MM + var minutes = d.getMinutes().toString(); + var hours = d.getHours().toString(); + return interimRequest.pad(hours) + ":" + interimRequest.pad(minutes); + }, + + deleteSession : function() { + var fieldset = $(this).parents(".fieldset"); + fieldset.remove(); + var totalField = $('#id_form-TOTAL_FORMS'); + var total = +totalField.val(); + --total; + totalField.val(total); + if(total == 2){ + $(".btn-delete").addClass("hidden"); + } + }, + + get_formatted_utc_time : function (d) { + // returns time from Date object as HH:MM + var minutes = d.getUTCMinutes().toString(); + var hours = d.getUTCHours().toString(); + return interimRequest.pad(hours) + ":" + interimRequest.pad(minutes); + }, + + pad : function(str) { + // zero pads string 00 + if(str.length == 1){ + str = "0" + str; + } + return str; + }, + + setUTC : function() { + var fieldset = $(this).parents(".fieldset"); + var values = $(this).val().split(":"); + var name = $(this).attr("id") + "_utc"; + var utc = fieldset.find("#" + name); + var d = new Date(2000,1,1,values[0],values[1]); + utc.val(interimRequest.get_formatted_utc_time(d) + " UTC"); + //alert(utc.attr("id")); + }, + + timezoneChange : function() { + //alert("tz change"); + var fieldset = $(this).parents(".fieldset"); + var start_time = fieldset.find("input[name$='-time']"); + var end_time = fieldset.find("input[name$='-end_time']"); + start_time.trigger('blur'); + end_time.trigger('change'); + }, + toggleLocation : function() { if(this.checked){ $(".location").prop('disabled', false); diff --git a/ietf/templates/meeting/interim_request.html b/ietf/templates/meeting/interim_request.html index 4112904ad..535a22194 100644 --- a/ietf/templates/meeting/interim_request.html +++ b/ietf/templates/meeting/interim_request.html @@ -23,12 +23,17 @@
-
+
+
+ + + +
Meeting Type:
@@ -42,9 +47,10 @@ Series - -
+ +
+
{{ formset.management_form }} @@ -55,26 +61,31 @@
{% render_field form.city class="form-control location" placeholder="City" %} {% render_field form.country class="form-control location" %} - {% render_field form.timezone class="form-control location" %} + {% render_field form.timezone class="form-control" %}
- -
-
-
- {% render_field form.date class="form-control" %} -
- {% render_field form.time class="form-control time-field" placeholder="time" %} -

Time

-
- {% render_field form.utc_time class="form-control time-field computed" disabled="disabled" placeholder="UTC time" %} - {% render_field form.duration class="form-control time-field" placeholder="duration" %} - {% render_field form.end_time class="form-control time-field computed" placeholder="end time" disabled="disabled" %} -
-
+ +
{% render_field form.date class="form-control" %}
+
+ +
+ +
+ {% render_field form.time class="form-control time-field" placeholder="HH:MM" %} + {% render_field form.time_utc class="form-control time-field computed" disabled="disabled" placeholder="UTC" %}
+ +
+ {% render_field form.end_time class="form-control time-field computed" placeholder="HH:MM" disabled="disabled" %} + {% render_field form.end_time_utc class="form-control time-field computed" disabled="disabled" placeholder="UTC" %} +
+
+ +
+ +
{% render_field form.duration class="form-control time-field" placeholder="HH:MM" %}
@@ -91,6 +102,7 @@
{% render_field form.agenda_note class="form-control" placeholder="Note" %}
+
{% endfor %} @@ -103,7 +115,7 @@
Submit - Back + Back {% endbuttons %}
diff --git a/test/.gitignore b/test/.gitignore index 4adfe8fc7..3af0ccb68 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -1,2 +1 @@ -/*.pyc -/sql_setup.sql +/data diff --git a/test/data/.gitignore b/test/data/.gitignore new file mode 100644 index 000000000..33662f554 --- /dev/null +++ b/test/data/.gitignore @@ -0,0 +1 @@ +/* diff --git a/test/data/draft-aliases b/test/data/draft-aliases deleted file mode 100644 index 25d93ccb9..000000000 --- a/test/data/draft-aliases +++ /dev/null @@ -1,50 +0,0 @@ -# Generated by /home/henrik/src/db/trunk/ietf/bin/generate-draft-aliases at 2015-11-06_07:17:00 -xfilter-draft-ietf-manet-olsrv2-management-snapshot: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-manet-olsrv2-management-snapshot virtual.ietf.org" -xfilter-draft-ietf-manet-olsrv2-management-snapshot.authors: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-manet-olsrv2-management-snapshot.authors virtual.ietf.org" -xfilter-draft-ietf-manet-olsrv2-management-snapshot.chairs: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-manet-olsrv2-management-snapshot.chairs virtual.ietf.org" -xfilter-draft-ietf-manet-olsrv2-management-snapshot.ad: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-manet-olsrv2-management-snapshot.ad virtual.ietf.org" -xfilter-draft-ietf-manet-olsrv2-management-snapshot.shepherd: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-manet-olsrv2-management-snapshot.shepherd virtual.ietf.org" -xfilter-draft-ietf-manet-olsrv2-management-snapshot.all: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-manet-olsrv2-management-snapshot.all virtual.ietf.org" -xfilter-draft-wkumari-not-a-draft: "|/a/postconfirm/test-wrapper filter expand-draft-wkumari-not-a-draft virtual.ietf.org" -xfilter-draft-wkumari-not-a-draft.authors: "|/a/postconfirm/test-wrapper filter expand-draft-wkumari-not-a-draft.authors virtual.ietf.org" -xfilter-draft-wkumari-not-a-draft.all: "|/a/postconfirm/test-wrapper filter expand-draft-wkumari-not-a-draft.all virtual.ietf.org" -xfilter-draft-ietf-isis-segment-routing-extensions: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-isis-segment-routing-extensions virtual.ietf.org" -xfilter-draft-ietf-isis-segment-routing-extensions.authors: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-isis-segment-routing-extensions.authors virtual.ietf.org" -xfilter-draft-ietf-isis-segment-routing-extensions.chairs: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-isis-segment-routing-extensions.chairs virtual.ietf.org" -xfilter-draft-ietf-isis-segment-routing-extensions.ad: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-isis-segment-routing-extensions.ad virtual.ietf.org" -xfilter-draft-ietf-isis-segment-routing-extensions.all: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-isis-segment-routing-extensions.all virtual.ietf.org" -xfilter-draft-jov-metropolitan-beacon-system-icd: "|/a/postconfirm/test-wrapper filter expand-draft-jov-metropolitan-beacon-system-icd virtual.ietf.org" -xfilter-draft-jov-metropolitan-beacon-system-icd.authors: "|/a/postconfirm/test-wrapper filter expand-draft-jov-metropolitan-beacon-system-icd.authors virtual.ietf.org" -xfilter-draft-jov-metropolitan-beacon-system-icd.all: "|/a/postconfirm/test-wrapper filter expand-draft-jov-metropolitan-beacon-system-icd.all virtual.ietf.org" -xfilter-draft-ietf-dnsop-edns-chain-query: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-dnsop-edns-chain-query virtual.ietf.org" -xfilter-draft-ietf-dnsop-edns-chain-query.authors: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-dnsop-edns-chain-query.authors virtual.ietf.org" -xfilter-draft-ietf-dnsop-edns-chain-query.chairs: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-dnsop-edns-chain-query.chairs virtual.ietf.org" -xfilter-draft-ietf-dnsop-edns-chain-query.ad: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-dnsop-edns-chain-query.ad virtual.ietf.org" -xfilter-draft-ietf-dnsop-edns-chain-query.shepherd: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-dnsop-edns-chain-query.shepherd virtual.ietf.org" -xfilter-draft-ietf-dnsop-edns-chain-query.all: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-dnsop-edns-chain-query.all virtual.ietf.org" -xfilter-draft-ietf-dnsop-edns-tcp-keepalive: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-dnsop-edns-tcp-keepalive virtual.ietf.org" -xfilter-draft-ietf-dnsop-edns-tcp-keepalive.authors: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-dnsop-edns-tcp-keepalive.authors virtual.ietf.org" -xfilter-draft-ietf-dnsop-edns-tcp-keepalive.chairs: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-dnsop-edns-tcp-keepalive.chairs virtual.ietf.org" -xfilter-draft-ietf-dnsop-edns-tcp-keepalive.ad: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-dnsop-edns-tcp-keepalive.ad virtual.ietf.org" -xfilter-draft-ietf-dnsop-edns-tcp-keepalive.shepherd: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-dnsop-edns-tcp-keepalive.shepherd virtual.ietf.org" -xfilter-draft-ietf-dnsop-edns-tcp-keepalive.all: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-dnsop-edns-tcp-keepalive.all virtual.ietf.org" -xfilter-draft-mcallister-pim-yang: "|/a/postconfirm/test-wrapper filter expand-draft-mcallister-pim-yang virtual.ietf.org" -xfilter-draft-mcallister-pim-yang.authors: "|/a/postconfirm/test-wrapper filter expand-draft-mcallister-pim-yang.authors virtual.ietf.org" -xfilter-draft-mcallister-pim-yang.all: "|/a/postconfirm/test-wrapper filter expand-draft-mcallister-pim-yang.all virtual.ietf.org" -xfilter-draft-mglt-dnsop-search-list-processing: "|/a/postconfirm/test-wrapper filter expand-draft-mglt-dnsop-search-list-processing virtual.ietf.org" -xfilter-draft-mglt-dnsop-search-list-processing.authors: "|/a/postconfirm/test-wrapper filter expand-draft-mglt-dnsop-search-list-processing.authors virtual.ietf.org" -xfilter-draft-mglt-dnsop-search-list-processing.all: "|/a/postconfirm/test-wrapper filter expand-draft-mglt-dnsop-search-list-processing.all virtual.ietf.org" -xfilter-draft-hansen-scram-sha256: "|/a/postconfirm/test-wrapper filter expand-draft-hansen-scram-sha256 virtual.ietf.org" -xfilter-draft-hansen-scram-sha256.authors: "|/a/postconfirm/test-wrapper filter expand-draft-hansen-scram-sha256.authors virtual.ietf.org" -xfilter-draft-hansen-scram-sha256.ad: "|/a/postconfirm/test-wrapper filter expand-draft-hansen-scram-sha256.ad virtual.ietf.org" -xfilter-draft-hansen-scram-sha256.shepherd: "|/a/postconfirm/test-wrapper filter expand-draft-hansen-scram-sha256.shepherd virtual.ietf.org" -xfilter-draft-hansen-scram-sha256.all: "|/a/postconfirm/test-wrapper filter expand-draft-hansen-scram-sha256.all virtual.ietf.org" -xfilter-draft-ietf-6man-why64: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-6man-why64 virtual.ietf.org" -xfilter-draft-ietf-6man-why64.authors: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-6man-why64.authors virtual.ietf.org" -xfilter-draft-ietf-6man-why64.chairs: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-6man-why64.chairs virtual.ietf.org" -xfilter-draft-ietf-6man-why64.ad: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-6man-why64.ad virtual.ietf.org" -xfilter-draft-ietf-6man-why64.shepherd: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-6man-why64.shepherd virtual.ietf.org" -xfilter-draft-ietf-6man-why64.all: "|/a/postconfirm/test-wrapper filter expand-draft-ietf-6man-why64.all virtual.ietf.org" -xfilter-draft-jones-jose-jwk-thumbprint: "|/a/postconfirm/test-wrapper filter expand-draft-jones-jose-jwk-thumbprint virtual.ietf.org" -xfilter-draft-jones-jose-jwk-thumbprint.authors: "|/a/postconfirm/test-wrapper filter expand-draft-jones-jose-jwk-thumbprint.authors virtual.ietf.org" -xfilter-draft-jones-jose-jwk-thumbprint.all: "|/a/postconfirm/test-wrapper filter expand-draft-jones-jose-jwk-thumbprint.all virtual.ietf.org" diff --git a/test/data/draft-virtual b/test/data/draft-virtual deleted file mode 100644 index ff57bb615..000000000 --- a/test/data/draft-virtual +++ /dev/null @@ -1,50 +0,0 @@ -# Generated by /home/henrik/src/db/trunk/ietf/bin/generate-draft-aliases at 2015-11-06_07:17:00 -virtual.ietf.org anything -draft-ietf-manet-olsrv2-management-snapshot@ietf.org xfilter-draft-ietf-manet-olsrv2-management-snapshot -expand-draft-ietf-manet-olsrv2-management-snapshot@virtual.ietf.org T.Clausen@computer.org, ulrich@herberg.name -draft-ietf-manet-olsrv2-management-snapshot.authors@ietf.org xfilter-draft-ietf-manet-olsrv2-management-snapshot.authors -expand-draft-ietf-manet-olsrv2-management-snapshot.authors@virtual.ietf.org T.Clausen@computer.org, ulrich@herberg.name -draft-ietf-manet-olsrv2-management-snapshot.chairs@ietf.org xfilter-draft-ietf-manet-olsrv2-management-snapshot.chairs -expand-draft-ietf-manet-olsrv2-management-snapshot.chairs@virtual.ietf.org sratliff@idirect.net, bebemaster@gmail.com -draft-ietf-manet-olsrv2-management-snapshot.ad@ietf.org xfilter-draft-ietf-manet-olsrv2-management-snapshot.ad -expand-draft-ietf-manet-olsrv2-management-snapshot.ad@virtual.ietf.org aretana@cisco.com, db3546@att.com, akatlas@gmail.com -draft-ietf-manet-olsrv2-management-snapshot.shepherd@ietf.org xfilter-draft-ietf-manet-olsrv2-management-snapshot.shepherd -expand-draft-ietf-manet-olsrv2-management-snapshot.shepherd@virtual.ietf.org chris.dearlove@baesystems.com -draft-ietf-manet-olsrv2-management-snapshot.all@ietf.org xfilter-draft-ietf-manet-olsrv2-management-snapshot.all -expand-draft-ietf-manet-olsrv2-management-snapshot.all@virtual.ietf.org T.Clausen@computer.org, ulrich@herberg.name, sratliff@idirect.net, bebemaster@gmail.com, aretana@cisco.com, db3546@att.com, akatlas@gmail.com, chris.dearlove@baesystems.com -draft-wkumari-not-a-draft@ietf.org xfilter-draft-wkumari-not-a-draft -expand-draft-wkumari-not-a-draft@virtual.ietf.org warren@kumari.net -draft-wkumari-not-a-draft.authors@ietf.org xfilter-draft-wkumari-not-a-draft.authors -expand-draft-wkumari-not-a-draft.authors@virtual.ietf.org warren@kumari.net -draft-wkumari-not-a-draft.all@ietf.org xfilter-draft-wkumari-not-a-draft.all -expand-draft-wkumari-not-a-draft.all@virtual.ietf.org warren@kumari.net -draft-ietf-isis-segment-routing-extensions@ietf.org xfilter-draft-ietf-isis-segment-routing-extensions -expand-draft-ietf-isis-segment-routing-extensions@virtual.ietf.org sprevidi@cisco.com, cfilsfil@cisco.com, bashandy@cisco.com, hannes@gredler.at, stephane.litkowski@orange.com, jeff.tantsura@ericsson.com, bruno.decraene@orange.com -draft-ietf-isis-segment-routing-extensions.authors@ietf.org xfilter-draft-ietf-isis-segment-routing-extensions.authors -expand-draft-ietf-isis-segment-routing-extensions.authors@virtual.ietf.org sprevidi@cisco.com, cfilsfil@cisco.com, bashandy@cisco.com, hannes@gredler.at, stephane.litkowski@orange.com, jeff.tantsura@ericsson.com, bruno.decraene@orange.com -draft-ietf-isis-segment-routing-extensions.chairs@ietf.org xfilter-draft-ietf-isis-segment-routing-extensions.chairs -expand-draft-ietf-isis-segment-routing-extensions.chairs@virtual.ietf.org hannes@gredler.at, chopps@chopps.org -draft-ietf-isis-segment-routing-extensions.ad@ietf.org xfilter-draft-ietf-isis-segment-routing-extensions.ad -expand-draft-ietf-isis-segment-routing-extensions.ad@virtual.ietf.org aretana@cisco.com, db3546@att.com, akatlas@gmail.com -draft-ietf-isis-segment-routing-extensions.all@ietf.org xfilter-draft-ietf-isis-segment-routing-extensions.all -expand-draft-ietf-isis-segment-routing-extensions.all@virtual.ietf.org sprevidi@cisco.com, cfilsfil@cisco.com, bashandy@cisco.com, hannes@gredler.at, stephane.litkowski@orange.com, jeff.tantsura@ericsson.com, bruno.decraene@orange.com, chopps@chopps.org, aretana@cisco.com, db3546@att.com, akatlas@gmail.com -draft-jov-metropolitan-beacon-system-icd@ietf.org xfilter-draft-jov-metropolitan-beacon-system-icd -expand-draft-jov-metropolitan-beacon-system-icd@virtual.ietf.org jvogedes@nextnav.com -draft-jov-metropolitan-beacon-system-icd.authors@ietf.org xfilter-draft-jov-metropolitan-beacon-system-icd.authors -expand-draft-jov-metropolitan-beacon-system-icd.authors@virtual.ietf.org jvogedes@nextnav.com -draft-jov-metropolitan-beacon-system-icd.all@ietf.org xfilter-draft-jov-metropolitan-beacon-system-icd.all -expand-draft-jov-metropolitan-beacon-system-icd.all@virtual.ietf.org jvogedes@nextnav.com -draft-ietf-dnsop-edns-chain-query@ietf.org xfilter-draft-ietf-dnsop-edns-chain-query -expand-draft-ietf-dnsop-edns-chain-query@virtual.ietf.org pwouters@redhat.com -draft-ietf-dnsop-edns-chain-query.authors@ietf.org xfilter-draft-ietf-dnsop-edns-chain-query.authors -expand-draft-ietf-dnsop-edns-chain-query.authors@virtual.ietf.org pwouters@redhat.com -draft-ietf-dnsop-edns-chain-query.chairs@ietf.org xfilter-draft-ietf-dnsop-edns-chain-query.chairs -expand-draft-ietf-dnsop-edns-chain-query.chairs@virtual.ietf.org suzworldwide@gmail.com, tjw.ietf@gmail.com -draft-ietf-dnsop-edns-chain-query.ad@ietf.org xfilter-draft-ietf-dnsop-edns-chain-query.ad -expand-draft-ietf-dnsop-edns-chain-query.ad@virtual.ietf.org bclaise@cisco.com, joelja@bogus.com -draft-ietf-dnsop-edns-chain-query.shepherd@ietf.org xfilter-draft-ietf-dnsop-edns-chain-query.shepherd -expand-draft-ietf-dnsop-edns-chain-query.shepherd@virtual.ietf.org tjw.ietf@gmail.com -draft-ietf-dnsop-edns-chain-query.all@ietf.org xfilter-draft-ietf-dnsop-edns-chain-query.all -expand-draft-ietf-dnsop-edns-chain-query.all@virtual.ietf.org pwouters@redhat.com, suzworldwide@gmail.com, tjw.ietf@gmail.com, bclaise@cisco.com, joelja@bogus.com -draft-ietf-dnsop-edns-tcp-keepalive@ietf.org xfilter-draft-ietf-dnsop-edns-tcp-keepalive -expand-draft-ietf-dnsop-edns-tcp-keepalive@virtual.ietf.org pwouters@redhat.com, jabley@dyn.com, sara@sinodun.com, ray@isc.org diff --git a/test/data/group-aliases b/test/data/group-aliases deleted file mode 100644 index 779dd0104..000000000 --- a/test/data/group-aliases +++ /dev/null @@ -1,50 +0,0 @@ -# Generated by /home/henrik/src/db/trunk/ietf/bin/generate-wg-aliases at 2015-11-06_07:16:40 -xfilter-vgmib-ads: "|/a/postconfirm/test-wrapper filter expand-vgmib-ads virtual.ietf.org" -xfilter-vgmib-chairs: "|/a/postconfirm/test-wrapper filter expand-vgmib-chairs virtual.ietf.org" -xfilter-asid-chairs: "|/a/postconfirm/test-wrapper filter expand-asid-chairs virtual.ietf.org" -xfilter-addrconf-ads: "|/a/postconfirm/test-wrapper filter expand-addrconf-ads virtual.ietf.org" -xfilter-addrconf-chairs: "|/a/postconfirm/test-wrapper filter expand-addrconf-chairs virtual.ietf.org" -xfilter-aeiou-chairs: "|/a/postconfirm/test-wrapper filter expand-aeiou-chairs virtual.ietf.org" -xfilter-ale-ads: "|/a/postconfirm/test-wrapper filter expand-ale-ads virtual.ietf.org" -xfilter-ale-chairs: "|/a/postconfirm/test-wrapper filter expand-ale-chairs virtual.ietf.org" -xfilter-alertman-ads: "|/a/postconfirm/test-wrapper filter expand-alertman-ads virtual.ietf.org" -xfilter-alertman-chairs: "|/a/postconfirm/test-wrapper filter expand-alertman-chairs virtual.ietf.org" -xfilter-aaarg-chairs: "|/a/postconfirm/test-wrapper filter expand-aaarg-chairs virtual.ietf.org" -xfilter-acap-chairs: "|/a/postconfirm/test-wrapper filter expand-acap-chairs virtual.ietf.org" -xfilter-applmib-chairs: "|/a/postconfirm/test-wrapper filter expand-applmib-chairs virtual.ietf.org" -xfilter-osinsap-ads: "|/a/postconfirm/test-wrapper filter expand-osinsap-ads virtual.ietf.org" -xfilter-osinsap-chairs: "|/a/postconfirm/test-wrapper filter expand-osinsap-chairs virtual.ietf.org" -xfilter-afic-chairs: "|/a/postconfirm/test-wrapper filter expand-afic-chairs virtual.ietf.org" -xfilter-atommib-ads: "|/a/postconfirm/test-wrapper filter expand-atommib-ads virtual.ietf.org" -xfilter-atommib-chairs: "|/a/postconfirm/test-wrapper filter expand-atommib-chairs virtual.ietf.org" -xfilter-avt-chairs: "|/a/postconfirm/test-wrapper filter expand-avt-chairs virtual.ietf.org" -xfilter-aft-ads: "|/a/postconfirm/test-wrapper filter expand-aft-ads virtual.ietf.org" -xfilter-aft-chairs: "|/a/postconfirm/test-wrapper filter expand-aft-chairs virtual.ietf.org" -xfilter-aac-ads: "|/a/postconfirm/test-wrapper filter expand-aac-ads virtual.ietf.org" -xfilter-aac-chairs: "|/a/postconfirm/test-wrapper filter expand-aac-chairs virtual.ietf.org" -xfilter-list-chairs: "|/a/postconfirm/test-wrapper filter expand-list-chairs virtual.ietf.org" -xfilter-bmwg-ads: "|/a/postconfirm/test-wrapper filter expand-bmwg-ads virtual.ietf.org" -xfilter-bmwg-chairs: "|/a/postconfirm/test-wrapper filter expand-bmwg-chairs virtual.ietf.org" -xfilter-bgpdepl-ads: "|/a/postconfirm/test-wrapper filter expand-bgpdepl-ads virtual.ietf.org" -xfilter-bgpdepl-chairs: "|/a/postconfirm/test-wrapper filter expand-bgpdepl-chairs virtual.ietf.org" -xfilter-bgp-ads: "|/a/postconfirm/test-wrapper filter expand-bgp-ads virtual.ietf.org" -xfilter-bgp-chairs: "|/a/postconfirm/test-wrapper filter expand-bgp-chairs virtual.ietf.org" -xfilter-bridge-ads: "|/a/postconfirm/test-wrapper filter expand-bridge-ads virtual.ietf.org" -xfilter-bridge-chairs: "|/a/postconfirm/test-wrapper filter expand-bridge-chairs virtual.ietf.org" -xfilter-calsch-chairs: "|/a/postconfirm/test-wrapper filter expand-calsch-chairs virtual.ietf.org" -xfilter-charmib-ads: "|/a/postconfirm/test-wrapper filter expand-charmib-ads virtual.ietf.org" -xfilter-charmib-chairs: "|/a/postconfirm/test-wrapper filter expand-charmib-chairs virtual.ietf.org" -xfilter-charset-chairs: "|/a/postconfirm/test-wrapper filter expand-charset-chairs virtual.ietf.org" -xfilter-chassis-ads: "|/a/postconfirm/test-wrapper filter expand-chassis-ads virtual.ietf.org" -xfilter-chassis-chairs: "|/a/postconfirm/test-wrapper filter expand-chassis-chairs virtual.ietf.org" -xfilter-cidrd-ads: "|/a/postconfirm/test-wrapper filter expand-cidrd-ads virtual.ietf.org" -xfilter-cidrd-chairs: "|/a/postconfirm/test-wrapper filter expand-cidrd-chairs virtual.ietf.org" -xfilter-cidr-ads: "|/a/postconfirm/test-wrapper filter expand-cidr-ads virtual.ietf.org" -xfilter-cidr-chairs: "|/a/postconfirm/test-wrapper filter expand-cidr-chairs virtual.ietf.org" -xfilter-cmot-ads: "|/a/postconfirm/test-wrapper filter expand-cmot-ads virtual.ietf.org" -xfilter-cmot-chairs: "|/a/postconfirm/test-wrapper filter expand-cmot-chairs virtual.ietf.org" -xfilter-colip-chairs: "|/a/postconfirm/test-wrapper filter expand-colip-chairs virtual.ietf.org" -xfilter-cipso-ads: "|/a/postconfirm/test-wrapper filter expand-cipso-ads virtual.ietf.org" -xfilter-cipso-chairs: "|/a/postconfirm/test-wrapper filter expand-cipso-chairs virtual.ietf.org" -xfilter-catnip-ads: "|/a/postconfirm/test-wrapper filter expand-catnip-ads virtual.ietf.org" -xfilter-catnip-chairs: "|/a/postconfirm/test-wrapper filter expand-catnip-chairs virtual.ietf.org" diff --git a/test/data/group-virtual b/test/data/group-virtual deleted file mode 100644 index 3f7069850..000000000 --- a/test/data/group-virtual +++ /dev/null @@ -1,50 +0,0 @@ -# Generated by /home/henrik/src/db/trunk/ietf/bin/generate-wg-aliases at 2015-11-06_07:16:40 -virtual.ietf.org anything -vgmib-ads@ietf.org xfilter-vgmib-ads -expand-vgmib-ads@virtual.ietf.org brian@innovationslab.net, terry.manderson@icann.org -vgmib-chairs@ietf.org xfilter-vgmib-chairs -expand-vgmib-chairs@virtual.ietf.org jeff@redbacknetworks.com -asid-chairs@ietf.org xfilter-asid-chairs -expand-asid-chairs@virtual.ietf.org timhowes@yahoo.com, paf@netnod.se -addrconf-ads@ietf.org xfilter-addrconf-ads -expand-addrconf-ads@virtual.ietf.org sob@sobco.com, mankin@psg.com -addrconf-chairs@ietf.org xfilter-addrconf-chairs -expand-addrconf-chairs@virtual.ietf.org sethomso@cisco.com -aeiou-chairs@ietf.org xfilter-aeiou-chairs -expand-aeiou-chairs@virtual.ietf.org brian.e.carpenter@gmail.com -ale-ads@ietf.org xfilter-ale-ads -expand-ale-ads@virtual.ietf.org sob@sobco.com, mankin@psg.com -ale-chairs@ietf.org xfilter-ale-chairs -expand-ale-chairs@virtual.ietf.org solensky@blaze-net.com, tli@cisco.com -alertman-ads@ietf.org xfilter-alertman-ads -expand-alertman-ads@virtual.ietf.org kostick@qsun.att.com -alertman-chairs@ietf.org xfilter-alertman-chairs -expand-alertman-chairs@virtual.ietf.org louiss@operations.com -aaarg-chairs@ietf.org xfilter-aaarg-chairs -expand-aaarg-chairs@virtual.ietf.org Paul@mci.net -acap-chairs@ietf.org xfilter-acap-chairs -expand-acap-chairs@virtual.ietf.org chris.newman@oracle.com, wall@cyrusoft.com -applmib-chairs@ietf.org xfilter-applmib-chairs -expand-applmib-chairs@virtual.ietf.org saperia@jdscons.com, cheryl@empiretech.com -osinsap-ads@ietf.org xfilter-osinsap-ads -expand-osinsap-ads@virtual.ietf.org hagens@mci.net, rcallon@juniper.net -osinsap-chairs@ietf.org xfilter-osinsap-chairs -expand-osinsap-chairs@virtual.ietf.org colella@aol.net -afic-chairs@ietf.org xfilter-afic-chairs -expand-afic-chairs@virtual.ietf.org jgrace@acm.org, laubach@com21.com -atommib-ads@ietf.org xfilter-atommib-ads -expand-atommib-ads@virtual.ietf.org bclaise@cisco.com, joelja@bogus.com -atommib-chairs@ietf.org xfilter-atommib-chairs -expand-atommib-chairs@virtual.ietf.org fayely@juniper.net, hklam@lucent.com -avt-chairs@ietf.org xfilter-avt-chairs -expand-avt-chairs@virtual.ietf.org keith.drage@alcatel-lucent.com, ron.even.tlv@gmail.com -aft-ads@ietf.org xfilter-aft-ads -expand-aft-ads@virtual.ietf.org Kathleen.Moriarty.ietf@gmail.com, stephen.farrell@cs.tcd.ie -aft-chairs@ietf.org xfilter-aft-chairs -expand-aft-chairs@virtual.ietf.org wlu@syl.dl.nec.com -aac-ads@ietf.org xfilter-aac-ads -expand-aac-ads@virtual.ietf.org Kathleen.Moriarty.ietf@gmail.com, stephen.farrell@cs.tcd.ie -aac-chairs@ietf.org xfilter-aac-chairs -expand-aac-chairs@virtual.ietf.org bcn@isi.edu -list-chairs@ietf.org xfilter-list-chairs -expand-list-chairs@virtual.ietf.org lippke@aol.net