@@ -49,14 +49,19 @@ nttApp.config(['$routeProvider', function($routeProvider){
         templateUrl: '/static/partials/cloud/cloud.html',
     });
 
-    $routeProvider.when('/cloudtraffic/add/:cloudId/', {
+    $routeProvider.when('/cloudtraffic/view/:id/', {
+        controller: 'CloudTrafficViewCtrl',
+        templateUrl: '/static/partials/cloud/cloudtraffic_view.html',
+    });
+
+    $routeProvider.when('/cloudtraffic/:event/:cloudId/', {
         controller: 'CloudTrafficCtrl',
         templateUrl: '/static/partials/cloud/cloudtraffic_form.html',
     });
 
-    $routeProvider.when('/cloudtraffic/view/:id/', {
-        controller: 'CloudTrafficViewCtrl',
-        templateUrl: '/static/partials/cloud/cloudtraffic_view.html',
+    $routeProvider.when('/cloudtraffic/:event/:cloudId/:trafficId/', {
+        controller: 'CloudTrafficCtrl',
+        templateUrl: '/static/partials/cloud/cloudtraffic_form.html',
     });
 
     $routeProvider.when('/cloudtraffictest/', {
 
@@ -46,23 +46,45 @@ nttApp.controller('CloudCtrl', function($scope, $routeParams, $location, cloudSe
         };
 
     };
+
+    $scope.deleteTraffic = function($index){
+        if(confirm("Are you sure want to delete?")) {
+            cloudTrafficService.delete($scope.cloudTrafficList[$index].id).then(function (data) {
+                $scope.cloudTrafficList.splice($index, 1);
+            });
+        }
+    }
 });
 
 
 
 nttApp.controller('CloudTrafficCtrl', function($scope, $routeParams, $location, cloudService, cloudTrafficService){
     $scope.cloud = {};
+    $scope.event = $routeParams.event;
     cloudService.get($routeParams.cloudId).then(function(data){
         $scope.cloud = data;
     });
 
     $scope.cloudTraffic = {};
-    $scope.save = function(){
-        $scope.cloudTraffic["cloud"] = $scope.cloud.id;
-        cloudTrafficService.create($scope.cloudTraffic).then(function (data) {
-            $location.path("cloudtraffic/view/"+ data.id +"/");
+    if($scope.event == 'edit'){
+        cloudTrafficService.get($routeParams.trafficId).then(function(data){
+            $scope.cloudTraffic = data;
         });
     };
+
+    $scope.save = function(){
+        if($scope.event == 'add') {
+            $scope.cloudTraffic["cloud"] = $scope.cloud.id;
+            cloudTrafficService.create($scope.cloudTraffic).then(function (data) {
+                $location.path("cloudtraffic/view/" + data.id + "/");
+            });
+        }
+        else{
+            cloudTrafficService.update($scope.cloudTraffic.id, $scope.cloudTraffic).then(function (data) {
+                $location.path("cloudtraffic/view/" + data.id + "/");
+            });
+        }
+    };
 });
 
 nttApp.controller('CloudTrafficViewCtrl', function($scope, $routeParams, $location, cloudService, cloudTrafficService, cloudTrafficTenantService){
@@ -97,9 +119,9 @@ nttApp.controller('CloudTrafficViewCtrl', function($scope, $routeParams, $locati
     };
 
     $scope.saveExternalHost = function(){
-        //cloudTrafficService.update($scope.cloudTraffic).then(function (data) {
+        cloudTrafficService.update($scope.cloudTraffic.id, $scope.cloudTraffic).then(function (data) {
             $location.path("cloudtraffictest");
-        //});
+        });
     };
 });
 
 
@@ -9,11 +9,10 @@ nttApp.service('cloudService', function(dataService){
         return dataService.post('/api/cloud/1/', params);
     };
     this.update = function(pk, params){
-        console.log(params)
-        return dataService.post2('/api/cloud/'+pk+'/', params);
+        return dataService.put('/api/cloud/'+pk+'/', params);
     };
-    this.delete = function(id){
-        return dataService.delete('/api/cloud/'+id+'/');
+    this.delete = function(pk){
+        return dataService.delete('/api/cloud/'+pk+'/');
     };
 });
 
@@ -27,8 +26,11 @@ nttApp.service('cloudTrafficService', function(dataService){
     this.create = function(params){
         return dataService.post('/api/cloudtraffic/', params);
     };
-    this.update = function(params){
-        return dataService.update('/api/cloudtraffic/', params);
+    this.update = function(pk, params){
+        return dataService.put('/api/cloudtraffic/'+pk+'/', params);
+    };
+    this.delete = function(pk){
+        return dataService.delete('/api/cloudtraffic/'+pk+'/');
     };
 });
 
 
@@ -60,7 +60,7 @@ nttApp.service('dataService', ['$http', '$q', function ($http, $q) {
         return deferred.promise;
     };
 
-    this.post2 = function (url, params) {
+    this.put = function (url, params) {
         var deferred = $q.defer();
         var request = $http.put(url, params);
         request.success(function (data, status, headers, config) {
 
@@ -53,8 +53,8 @@ <h1><i class="fa fa-cog fa-fw"></i> Cloud Traffic</h1>
                     <td>{$ cloudTraffic.iperf_duration $}</td>
                     <td>{$ cloudTraffic.tenant_type $}</td>
                     <td>
-                        <span class="text-info"><i class="fa fa-edit fa-fw"></i></span>
-                        <span class="text-danger"><i class="fa fa-trash-o fa-fw"></i></span>
+                        <a href="#/cloudtraffic/edit/{$ cloud.id $}/{$ cloudTraffic.id $}/" class="text-info"><i class="fa fa-edit fa-fw"></i></a>
+                        <a href class="text-danger" ng-click="deleteTraffic($index)"><i class="fa fa-trash-o fa-fw"></i></a></span>
                     </td>
                 </tr>
             </table>
 
@@ -6,7 +6,7 @@
     </div>
     <div class="row">
         <div class="col-md-12">
-            <h1>Add Cloud Traffic</h1>
+            <h1>{$ event | capitalize:true $} Cloud Traffic</h1>
             <h4>Cloud > Traffic</h4>
             <form name="cloudtraffic" ng-submit="save()">
                 <div class="form-group">