Merge pull request #93 from nre-learning/merge-stage-option

Provide more flexibility for initial device configuration

CHANGELOG.md

@@ -10,6 +10,7 @@
 - Added validation for making sure configs are present for each stage and device [#89](https://github.com/nre-learning/syringe/pull/89)
 - Add version to build info, share with syrctl [#90](https://github.com/nre-learning/syringe/pull/90)
 - Setting proper permissions on copied lesson dir, using config'd location [#92](https://github.com/nre-learning/syringe/pull/92)
+- Provide greater device configuration flexibility [#93](https://github.com/nre-learning/syringe/pull/93)
 
 ## v0.3.0 - February 11, 2019
 

scheduler/jobs.go

@@ -96,6 +96,8 @@ func (ls *LessonScheduler) configureDevice(ep *pb.LiveEndpoint, req *LessonSched
 
 	volumes, volumeMounts, initContainers := ls.getVolumesConfiguration()
 
+	configFile := fmt.Sprintf("%s/lessons/lesson-%d/stage%d/configs/%s.txt", ls.SyringeConfig.LessonRepoDir, req.LessonDef.LessonId, req.Stage, ep.Name)
+
 	configJob := &batchv1.Job{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      jobName,
@@ -125,19 +127,16 @@ func (ls *LessonScheduler) configureDevice(ep *pb.LiveEndpoint, req *LessonSched
 					InitContainers: initContainers,
 					Containers: []corev1.Container{
 						{
-							Name:  "napalm",
-							Image: "antidotelabs/napalm",
+							Name:  "configurator",
+							Image: "antidotelabs/configurator",
 							Command: []string{
-								"napalm",
-								"--user=antidote",
-								"--password=antidotepassword",
-								"--vendor=junos",
-								fmt.Sprintf("--optional_args=port=%d", ep.Port),
+								"/configure.py",
+								"antidote",
+								"antidotepassword",
+								"junos",
+								strconv.Itoa(int(ep.Port)),
 								ep.Host,
-								"configure",
-								// req.LessonDef.Stages[req.Stage].Configs[ep.Name],
-								fmt.Sprintf("/antidote/lessons/lesson-%d/stage%d/configs/%s.txt", req.LessonDef.LessonId, req.Stage, ep.Name),
-								"--strategy=replace", // To preserve atomicity between stages. All stages must provide full configurations.
+								configFile,
 							},
 
 							// TODO(mierdin): ONLY for test/dev. Should re-evaluate for prod