From 45dcc10418e0b6883f369e44dbc55eaa236fa9c9 Mon Sep 17 00:00:00 2001
From: Russ Housley <housley@vigilsec.com>
Date: Tue, 1 Jun 2021 18:35:54 +0000
Subject: [PATCH] Allow IAB Programs to be listed in meeting request conflicts.
 Ready for merge. Fixes #3270.  - Legacy-Id: 19052

---
 ietf/secr/sreq/forms.py | 2 +-
 ietf/secr/sreq/tests.py | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ietf/secr/sreq/forms.py b/ietf/secr/sreq/forms.py
index dd0697bf3..1aba94fd0 100644
--- a/ietf/secr/sreq/forms.py
+++ b/ietf/secr/sreq/forms.py
@@ -27,7 +27,7 @@ JOINT_FOR_SESSION_CHOICES = (('1', 'First session'), ('2', 'Second session'), ('
 # Helper Functions
 # -------------------------------------------------
 def allowed_conflicting_groups():
-    return Group.objects.filter(type__in=['wg', 'ag', 'rg', 'rag'], state__in=['bof', 'proposed', 'active'])
+    return Group.objects.filter(type__in=['wg', 'ag', 'rg', 'rag', 'program'], state__in=['bof', 'proposed', 'active'])
 
 def check_conflict(groups, source_group):
     '''
diff --git a/ietf/secr/sreq/tests.py b/ietf/secr/sreq/tests.py
index a7e8d7b8e..8f943d572 100644
--- a/ietf/secr/sreq/tests.py
+++ b/ietf/secr/sreq/tests.py
@@ -82,6 +82,8 @@ class SessionRequestTestCase(TestCase):
         group2 = GroupFactory()
         group3 = GroupFactory()
         group4 = GroupFactory()
+        iabprog = GroupFactory(type_id='program')
+
         SessionFactory(meeting=meeting,group=mars,status_id='sched')
 
         url = reverse('ietf.secr.sreq.views.edit', kwargs={'acronym':'mars'})
@@ -92,7 +94,7 @@ class SessionRequestTestCase(TestCase):
                      'length_session1':'3600',
                      'length_session2':'3600',
                      'attendees':'10',
-                     'conflict1':'',
+                     'conflict1':iabprog.acronym,
                      'comments':'need lights',
                      'session_time_relation': 'subsequent-days',
                      'adjacent_with_wg': group2.acronym,
@@ -108,6 +110,8 @@ class SessionRequestTestCase(TestCase):
         sessions = Session.objects.filter(meeting=meeting, group=mars)
         self.assertEqual(len(sessions), 2)
         session = sessions[0]
+
+        self.assertEqual(session.constraints().get(name='conflict').target.acronym, iabprog.acronym)
         self.assertEqual(session.constraints().get(name='time_relation').time_relation, 'subsequent-days')
         self.assertEqual(session.constraints().get(name='wg_adjacent').target.acronym, group2.acronym)
         self.assertEqual(