cleaning stuff up

Change-Id: Ib7e91c6e92b6f6b3c93f4d8ca5dcbfcf74f6c671
diff --git a/api/abstract_olt_api.proto b/api/abstract_olt_api.proto
index 86f9a72..12c8941 100644
--- a/api/abstract_olt_api.proto
+++ b/api/abstract_olt_api.proto
@@ -21,14 +21,8 @@
    string VCoreIP =2;
    int32 VCorePort=3;
 }
-message Error {
-   int32 ErrorNum = 1;
-   string ErrorMessage=2;
-   int32 Serverity=3;
-}
 message AddChassisReturn{
    string DeviceID = 1;
-   Error error = 2;
 }
 message AddOLTChassisMessage{
    string CLLI=1;
@@ -55,14 +49,13 @@
 message AddOLTChassisReturn {
    string DeviceID =1;
    string ChassisDeviceID =2;
-   Error error = 3;
 }
 message ActivateSlotMessage{
-   string SlotDeviceID = 1;
+   string CLLI =1;
+   int32 SlotNumber = 2;
 }
 message ActivateSlotReturn{
    bool Success = 1;
-   Error error = 2;
 }
 message AddOntMessage{
    string CLLI=1;
@@ -73,7 +66,6 @@
 }
 message AddOntReturn{
    bool Success=1;
-   Error error = 2;
 }
 
 service AbstractOLT{
diff --git a/api/handler_test.go b/api/handler_test.go
index 50c5355..c319e6d 100644
--- a/api/handler_test.go
+++ b/api/handler_test.go
@@ -22,6 +22,7 @@
 
 	"gerrit.opencord.org/abstract-olt/api"
 	"gerrit.opencord.org/abstract-olt/models/abstract"
+	"gerrit.opencord.org/abstract-olt/models/physical"
 	"golang.org/x/net/context"
 )
 
@@ -40,7 +41,6 @@
 		t.Fatalf("CreateChassis failed %v\n", err)
 	}
 	clli = ret.DeviceID
-
 }
 func TestHandler_CreateOLTChassis(t *testing.T) {
 	fmt.Println("in handlerTest_CreateChassis")
@@ -51,6 +51,30 @@
 		t.Fatalf("CreateOLTChassis failed %v\n", err)
 	}
 	fmt.Printf("CreateOLTChassis success %v\n", ret)
+}
+func TestHandler_EnableSlot(t *testing.T) {
+	ctx = context.Background()
+	server = api.Server{}
+	fmt.Println("in handler_test_EnableSlot")
+	// slot number 1 should be provisioned above
+	message := &api.ActivateSlotMessage{CLLI: clli, SlotNumber: 1}
+	ret, err := server.EnableSlot(ctx, message)
+	if err != nil {
+		t.Fatalf("EnableSlot failed with %v\n", err)
+	}
+	fmt.Printf("EnableSlot succeeded with %v\n", ret)
+	// Slot 2 isn't provisioned and should fail
+	message = &api.ActivateSlotMessage{CLLI: clli, SlotNumber: 2}
+	ret, err = server.EnableSlot(ctx, message)
+	if err != nil {
+		switch err.(type) {
+		case *physical.UnprovisionedSlotError:
+			fmt.Printf("EnableSlot failed as it should with %v\n", err)
+		default:
+			t.Fatalf("EnableSlot failed with %v\n", err)
+		}
+		t.Fatalf("EnableSlot should have failed but didn't")
+	}
 
 }
 func TestHandler_ProvisionOnt(t *testing.T) {
@@ -65,6 +89,7 @@
 	}
 	// this one should fail
 	fmt.Println("here")
+	//SlotNumber 1 hasn't been provisioned
 	message = &api.AddOntMessage{CLLI: clli, SlotNumber: 2, PortNumber: 3, OntNumber: 2, SerialNumber: "2033029402"}
 	ret, err = server.ProvisionOnt(ctx, message)
 	if err != nil {
@@ -78,5 +103,4 @@
 		t.Fatalf("ProvsionOnt should have failed but didn't")
 	}
 	fmt.Printf("ProvisionOnt success %v\n", ret)
-
 }