Merge pull request #262 from reasonerjt/job-service

api will handle replication job for a single repo

api/jobs/replication.go

@@ -23,6 +23,8 @@ type ReplicationJob struct {
 
 type ReplicationReq struct {
 	PolicyID  int64  `json:"policy_id"`
+	Repo      string `json:"repository"`
+	Operation string `json:"operation"`
 }
 
 func (rj *ReplicationJob) Post() {
@@ -40,6 +42,7 @@ func (rj *ReplicationJob) Post() {
 		rj.RenderError(http.StatusNotFound, fmt.Sprintf("Policy not found, id: %d", data.PolicyID))
 		return
 	}
+	if len(data.Repo) == 0 { // sync all repositories
 		repoList, err := getRepoList(p.ProjectID)
 		if err != nil {
 			log.Errorf("Failed to get repository list, project id: %d, error: %v", p.ProjectID, err)
@@ -48,21 +51,43 @@ func (rj *ReplicationJob) Post() {
 		}
 		log.Debugf("repo list: %v", repoList)
 		for _, repo := range repoList {
-		j := models.RepJob{
-			Repository: repo,
-			PolicyID:   data.PolicyID,
-			Operation:  models.RepOpTransfer,
-		}
-		log.Debugf("Creating job for repo: %s, policy: %d", repo, data.PolicyID)
-		id, err := dao.AddRepJob(j)
+			err := rj.addJob(repo, data.PolicyID, models.RepOpTransfer)
 			if err != nil {
 				log.Errorf("Failed to insert job record, error: %v", err)
 				rj.RenderError(http.StatusInternalServerError, err.Error())
 				return
 			}
+		}
+	} else { // sync a single repository
+		var op string
+		if len(data.Operation) > 0 {
+			op = data.Operation
+		} else {
+			op = models.RepOpTransfer
+		}
+		err := rj.addJob(data.Repo, data.PolicyID, op)
+		if err != nil {
+			log.Errorf("Failed to insert job record, error: %v", err)
+			rj.RenderError(http.StatusInternalServerError, err.Error())
+			return
+		}
+	}
+}
+
+func (rj *ReplicationJob) addJob(repo string, policyID int64, operation string) error {
+	j := models.RepJob{
+		Repository: repo,
+		PolicyID:   policyID,
+		Operation:  operation,
+	}
+	log.Debugf("Creating job for repo: %s, policy: %d", repo, policyID)
+	id, err := dao.AddRepJob(j)
+	if err != nil {
+		return err
+	}
 	log.Debugf("Send job to scheduler, job id: %d", id)
 	job.Schedule(id)
-	}
+	return nil
 }
 
 type RepActionReq struct {

jobservice/router.go

@@ -7,7 +7,7 @@ import (
 )
 
 func initRouters() {
-	beego.Router("/api/jobs/replication", &api.ReplicationJob{})
-	beego.Router("/api/jobs/replication/:id/log", &api.ReplicationJob{}, "get:GetLog")
-	beego.Router("/api/jobs/replication/actions", &api.ReplicationJob{}, "post:HandleAction")
+	beego.Router("/api/replicationJobs", &api.ReplicationJob{})
+	beego.Router("/api/replicationJobs/:id/log", &api.ReplicationJob{}, "get:GetLog")
+	beego.Router("/api/replicationJobs/actions", &api.ReplicationJob{}, "post:HandleAction")
 }

jobservice/sync_repo.json

@@ -0,0 +1 @@
+{"policy_id": 1, "repository":"library/ubuntu"}