Merge pull request #7 from 5genesis/nsless_slices

Nsless slices
5genesis · Jun 8, 2021 · e49387f · e49387f
2 parents f0a1e1a + c060f91
commit e49387f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+**08/06/2021** [Version 2.4.3]
+
+ - Add 'None' as selectable scenario
+
 **22/04/2021** [Version 2.4.2]
 
  - Analytics Dashboard integration

diff --git a/app/experiment/routes.py b/app/experiment/routes.py
@@ -14,11 +14,11 @@
 
 def _addSliceInfo(form, experiment):
     maybeSlice = form.get('sliceCheckboxedList', None)
-    maybeScenario = form.get('scenarioCheckboxedList', None)
+    maybeScenario = form.get('scenarioCheckboxedList', "[None]")
 
     if maybeSlice is not None:
         experiment.slice = maybeSlice
-    if maybeScenario is not None:
+    if maybeScenario != "[None]":
         experiment.scenario = maybeScenario
 
 
@@ -102,7 +102,7 @@ def create():
     customTestCases = Facility.AvailableCustomTestCases(current_user.email)
     parametersPerTestCase = Facility.TestCaseParameters()
     baseSlices = Facility.BaseSlices()
-    scenarios = Facility.Scenarios()
+    scenarios = ["[None]", *Facility.Scenarios()]
     parameterNamesPerTestCase: Dict[str, Set[str]] = {}
     testCaseNamesPerParameter: Dict[str, Set[str]] = {}
     parameterInfo: Dict[str, Dict[str, str]] = {}
@@ -172,8 +172,8 @@ def createDist():
          nss.append((ns.name, ns.id))
 
     return render_template('experiment/create_dist.html', title='New Distributed Experiment', form=form, nss=nss,
-                           sliceList=Facility.BaseSlices(), scenarioList=Facility.Scenarios(), ues=Facility.UEs(),
-                           ewEnabled=Config().EastWest.Enabled, remotes=remotes,
+                           sliceList=Facility.BaseSlices(), scenarioList=["[None]", *Facility.Scenarios()],
+                           ues=Facility.UEs(), ewEnabled=Config().EastWest.Enabled, remotes=remotes,
                            distributedTestCases=Facility.DistributedTestCases())
 
 
@@ -201,7 +201,7 @@ def configureRemote(experimentId: int):
     testCases = remoteApi.GetTestCases()
     ues = remoteApi.GetUEs()
     baseSlices = remoteApi.GetBaseSlices()
-    scenarios = remoteApi.GetScenarios()
+    scenarios = ["[None]", *remoteApi.GetScenarios()]
     networkServices = remoteApi.GetNetworkServices()
 
     nss: List[Tuple[str, int]] = []