Commit 039fcc49 authored by Yann Garcia's avatar Yann Garcia
Browse files

Merging issues fixed

parent 0d03c60d

go-packages/meep-dai-mgr/meep-dai-mgr_test.go

+17 −20
Original line number Original line Diff line number Diff line
@@ -45,7 +45,6 @@ const ( 
	appProvider1          = "appProvider1"

	appProvider1          = "appProvider1"

	appDVersion1          = "appDVersion1"

	appDVersion1          = "appDVersion1"

	appDescription1       = "appDescription1"

	appDescription1       = "appDescription1"

	appImage1             = ""

	appCmd1               = "ps"

	appCmd1               = "ps"





	associateDevAppId2    = "associateDevAppId2"

	associateDevAppId2    = "associateDevAppId2"
@@ -56,7 +55,6 @@ const ( 
	appProvider2          = "appProvider2"

	appProvider2          = "appProvider2"

	appDVersion2          = "appDVersion2"

	appDVersion2          = "appDVersion2"

	appDescription2       = "appDescription2"

	appDescription2       = "appDescription2"

	appImage2             = ""

	appCmd2               = "ls"

	appCmd2               = "ls"





	associateDevAppId3    = "associateDevAppId3"

	associateDevAppId3    = "associateDevAppId3"
@@ -67,7 +65,6 @@ const ( 
	appProvider3          = "appProvider3"

	appProvider3          = "appProvider3"

	appDVersion3          = "appDVersion3"

	appDVersion3          = "appDVersion3"

	appDescription3       = "appDescription3"

	appDescription3       = "appDescription3"

	appImage3             = ""

	appCmd3               = "uptime"

	appCmd3               = "uptime"

)

)
@@ -267,26 +264,26 @@ func TestNewDaiMgr(t *testing.T) { 




	// Invalid Connector

	// Invalid Connector

	fmt.Println("Invalid DAI Manager")

	fmt.Println("Invalid DAI Manager")

	am, err := NewDaiMgr("", amNamespace, amDBUser, amDBPwd, amDBHost, amDBPort)

	am, err := NewDaiMgr(DaiCfg { "", amNamespace, amDBUser, amDBPwd, amDBHost, amDBPort, nil })

	if err == nil || am != nil {

	if err == nil || am != nil {

		t.Fatalf("DB connection should have failed")

		t.Fatalf("DB connection should have failed")

	}

	}

	am, err = NewDaiMgr(amName, amNamespace, amDBUser, amDBPwd, "invalid-host", amDBPort)

	am, err = NewDaiMgr(DaiCfg { amName, amNamespace, amDBUser, amDBPwd, "invalid-host", amDBPort, nil })

	if err == nil || am != nil {

	if err == nil || am != nil {

		t.Fatalf("DB connection should have failed")

		t.Fatalf("DB connection should have failed")

	}

	}

	am, err = NewDaiMgr(amName, amNamespace, amDBUser, amDBPwd, amDBHost, "invalid-port")

	am, err = NewDaiMgr(DaiCfg { amName, amNamespace, amDBUser, amDBPwd, amDBHost, "invalid-port", nil })

	if err == nil || am != nil {

	if err == nil || am != nil {

		t.Fatalf("DB connection should have failed")

		t.Fatalf("DB connection should have failed")

	}

	}

	am, err = NewDaiMgr(amName, amNamespace, amDBUser, "invalid-pwd", amDBHost, amDBPort)

	am, err = NewDaiMgr(DaiCfg { amName, amNamespace, amDBUser, "invalid-pwd", amDBHost, amDBPort, nil })

	if err == nil || am != nil {

	if err == nil || am != nil {

		t.Fatalf("DB connection should have failed")

		t.Fatalf("DB connection should have failed")

	}

	}





	// Valid Connector

	// Valid Connector

	fmt.Println("Create valid DAI Manager")

	fmt.Println("Create valid DAI Manager")

	am, err = NewDaiMgr(amName, amNamespace, amDBUser, amDBPwd, amDBHost, amDBPort)

	am, err = NewDaiMgr(DaiCfg { amName, amNamespace, amDBUser, amDBPwd, amDBHost, amDBPort, nil })

	if err != nil || am == nil {

	if err != nil || am == nil {

		t.Fatalf("Failed to create DAI Manager")

		t.Fatalf("Failed to create DAI Manager")

	}

	}
@@ -327,7 +324,7 @@ func TestDaiMgrCreateAppList(t *testing.T) { 




	// Create Connector

	// Create Connector

	fmt.Println("Create valid Dai Manager")

	fmt.Println("Create valid Dai Manager")

	am, err := NewDaiMgr(amName, amNamespace, amDBUser, amDBPwd, amDBHost, amDBPort)

	am, err := NewDaiMgr(DaiCfg { amName, amNamespace, amDBUser, amDBPwd, amDBHost, amDBPort, nil })

	if err != nil || am == nil {

	if err != nil || am == nil {

		t.Fatalf("Failed to create Dai Manager")

		t.Fatalf("Failed to create Dai Manager")

	}

	}
@@ -358,7 +355,7 @@ func TestDaiMgrCreateAppList(t *testing.T) { 
	appLocation1[1] = LocationConstraintsItem{nil, &civicAddressElement1, nil}

	appLocation1[1] = LocationConstraintsItem{nil, &civicAddressElement1, nil}

	appCharcs1 := make([]AppCharcs, 1)

	appCharcs1 := make([]AppCharcs, 1)

	appCharcs1[0] = AppCharcs{&memory1, &storage1, &latency1, &bandwidth1, &serviceCont1}

	appCharcs1[0] = AppCharcs{&memory1, &storage1, &latency1, &bandwidth1, &serviceCont1}

	appInfoList1 := AppInfoList{appDId1, appName1, appProvider1, appSoftVersion1, appDVersion1, appDescription1, appLocation1, appCharcs1, appImage1, appCmd1}

	appInfoList1 := AppInfoList{appDId1, appName1, appProvider1, appSoftVersion1, appDVersion1, appDescription1, appLocation1, appCharcs1, appCmd1, []string{}}





	// Create an invalid AppInfoList - ContextId

	// Create an invalid AppInfoList - ContextId

	fmt.Println("Create an invalid AppInfoList - AppDId")

	fmt.Println("Create an invalid AppInfoList - AppDId")
@@ -447,7 +444,7 @@ func TestDaiMgrCreateAppList(t *testing.T) { 
	appLocation2[1] = LocationConstraintsItem{nil, &civicAddressElement2, nil}

	appLocation2[1] = LocationConstraintsItem{nil, &civicAddressElement2, nil}

	appCharcs2 := make([]AppCharcs, 1)

	appCharcs2 := make([]AppCharcs, 1)

	appCharcs2[0] = AppCharcs{&memory2, &storage2, &latency2, &bandwidth2, &serviceCont2}

	appCharcs2[0] = AppCharcs{&memory2, &storage2, &latency2, &bandwidth2, &serviceCont2}

	appInfoList2 := AppInfoList{appDId2, appName2, appProvider2, appSoftVersion2, appDVersion2, appDescription2, appLocation2, appCharcs2, appImage2, appCmd2}

	appInfoList2 := AppInfoList{appDId2, appName2, appProvider2, appSoftVersion2, appDVersion2, appDescription2, appLocation2, appCharcs2, appCmd2, []string{}}

	err = am.CreateAppEntry(appInfoList2)

	err = am.CreateAppEntry(appInfoList2)

	if err != nil {

	if err != nil {

		t.Fatalf(err.Error())

		t.Fatalf(err.Error())
@@ -474,7 +471,7 @@ func TestDaiMgrCreateAppList(t *testing.T) { 
	fmt.Println("Create another valid AppInfoList without any optional field")

	fmt.Println("Create another valid AppInfoList without any optional field")

	appLocation3 := make([]LocationConstraintsItem, 0)

	appLocation3 := make([]LocationConstraintsItem, 0)

	appCharcs3 := make([]AppCharcs, 0)

	appCharcs3 := make([]AppCharcs, 0)

	appInfoList3 := AppInfoList{appDId3, appName3, appProvider3, appSoftVersion3, appDVersion3, appDescription3, appLocation3, appCharcs3, appImage3, appCmd3}

	appInfoList3 := AppInfoList{appDId3, appName3, appProvider3, appSoftVersion3, appDVersion3, appDescription3, appLocation3, appCharcs3, appCmd2, []string{}}

	err = am.CreateAppEntry(appInfoList3)

	err = am.CreateAppEntry(appInfoList3)

	if err != nil {

	if err != nil {

		t.Fatalf(err.Error())

		t.Fatalf(err.Error())
@@ -512,7 +509,7 @@ func TestDaiMgrCreateAppContext(t *testing.T) { 




	// Create Connector

	// Create Connector

	fmt.Println("Create valid Dai Manager")

	fmt.Println("Create valid Dai Manager")

	am, err := NewDaiMgr(amName, amNamespace, amDBUser, amDBPwd, amDBHost, amDBPort)

	am, err := NewDaiMgr(DaiCfg { amName, amNamespace, amDBUser, amDBPwd, amDBHost, amDBPort, nil })

	if err != nil || am == nil {

	if err != nil || am == nil {

		t.Fatalf("Failed to create Dai Manager")

		t.Fatalf("Failed to create Dai Manager")

	}

	}
@@ -544,7 +541,7 @@ func TestDaiMgrCreateAppContext(t *testing.T) { 
	appLocation1[1] = LocationConstraintsItem{nil, &civicAddressElement1, nil}

	appLocation1[1] = LocationConstraintsItem{nil, &civicAddressElement1, nil}

	appCharcs1 := make([]AppCharcs, 1)

	appCharcs1 := make([]AppCharcs, 1)

	appCharcs1[0] = AppCharcs{&memory1, &storage1, &latency1, &bandwidth1, &serviceCont1}

	appCharcs1[0] = AppCharcs{&memory1, &storage1, &latency1, &bandwidth1, &serviceCont1}

	appInfoList1 := AppInfoList{appDId1, appName1, appProvider1, appSoftVersion1, appDVersion1, appDescription1, appLocation1, appCharcs1, appImage1, appCmd1}

	appInfoList1 := AppInfoList{appDId1, appName1, appProvider1, appSoftVersion1, appDVersion1, appDescription1, appLocation1, appCharcs1, appCmd1, []string{}}

	err = am.CreateAppEntry(appInfoList1)

	err = am.CreateAppEntry(appInfoList1)

	if err != nil {

	if err != nil {

		t.Fatalf(err.Error())

		t.Fatalf(err.Error())
@@ -554,14 +551,14 @@ func TestDaiMgrCreateAppContext(t *testing.T) { 
	appLocation2[1] = LocationConstraintsItem{nil, &civicAddressElement2, nil}

	appLocation2[1] = LocationConstraintsItem{nil, &civicAddressElement2, nil}

	appCharcs2 := make([]AppCharcs, 1)

	appCharcs2 := make([]AppCharcs, 1)

	appCharcs2[0] = AppCharcs{&memory2, &storage2, &latency2, &bandwidth2, &serviceCont2}

	appCharcs2[0] = AppCharcs{&memory2, &storage2, &latency2, &bandwidth2, &serviceCont2}

	appInfoList2 := AppInfoList{appDId2, appName2, appProvider2, appSoftVersion2, appDVersion2, appDescription2, appLocation2, appCharcs2, appImage2, appCmd2}

	appInfoList2 := AppInfoList{appDId2, appName2, appProvider2, appSoftVersion2, appDVersion2, appDescription2, appLocation2, appCharcs2, appCmd2, []string{}}

	err = am.CreateAppEntry(appInfoList2)

	err = am.CreateAppEntry(appInfoList2)

	if err != nil {

	if err != nil {

		t.Fatalf(err.Error())

		t.Fatalf(err.Error())

	}

	}

	appLocation3 := make([]LocationConstraintsItem, 0)

	appLocation3 := make([]LocationConstraintsItem, 0)

	appCharcs3 := make([]AppCharcs, 0)

	appCharcs3 := make([]AppCharcs, 0)

	appInfoList3 := AppInfoList{appDId3, appName3, appProvider3, appSoftVersion3, appDVersion3, appDescription3, appLocation3, appCharcs3, appImage3, appCmd3}

	appInfoList3 := AppInfoList{appDId3, appName3, appProvider3, appSoftVersion3, appDVersion3, appDescription3, appLocation3, appCharcs3, appCmd3, []string{}}

	err = am.CreateAppEntry(appInfoList3)

	err = am.CreateAppEntry(appInfoList3)

	if err != nil {

	if err != nil {

		t.Fatalf(err.Error())

		t.Fatalf(err.Error())
@@ -789,7 +786,7 @@ func TestDaiMgrDeleteAppContext(t *testing.T) { 




	// Create Connector

	// Create Connector

	fmt.Println("Create valid Dai Manager")

	fmt.Println("Create valid Dai Manager")

	am, err := NewDaiMgr(amName, amNamespace, amDBUser, amDBPwd, amDBHost, amDBPort)

	am, err := NewDaiMgr(DaiCfg { amName, amNamespace, amDBUser, amDBPwd, amDBHost, amDBPort, nil })

	if err != nil || am == nil {

	if err != nil || am == nil {

		t.Fatalf("Failed to create Dai Manager")

		t.Fatalf("Failed to create Dai Manager")

	}

	}
@@ -821,7 +818,7 @@ func TestDaiMgrDeleteAppContext(t *testing.T) { 
	appLocation1[1] = LocationConstraintsItem{nil, &civicAddressElement1, nil}

	appLocation1[1] = LocationConstraintsItem{nil, &civicAddressElement1, nil}

	appCharcs1 := make([]AppCharcs, 1)

	appCharcs1 := make([]AppCharcs, 1)

	appCharcs1[0] = AppCharcs{&memory1, &storage1, &latency1, &bandwidth1, &serviceCont1}

	appCharcs1[0] = AppCharcs{&memory1, &storage1, &latency1, &bandwidth1, &serviceCont1}

	appInfoList1 := AppInfoList{appDId1, appName1, appProvider1, appSoftVersion1, appDVersion1, appDescription1, appLocation1, appCharcs1, appImage1, appCmd1}

	appInfoList1 := AppInfoList{appDId1, appName1, appProvider1, appSoftVersion1, appDVersion1, appDescription1, appLocation1, appCharcs1, appCmd1, []string{}}

	err = am.CreateAppEntry(appInfoList1)

	err = am.CreateAppEntry(appInfoList1)

	if err != nil {

	if err != nil {

		t.Fatalf(err.Error())

		t.Fatalf(err.Error())
@@ -886,7 +883,7 @@ func TestDaiMgrPutAppContext(t *testing.T) { 




	// Create Connector

	// Create Connector

	fmt.Println("Create valid Dai Manager")

	fmt.Println("Create valid Dai Manager")

	am, err := NewDaiMgr(amName, amNamespace, amDBUser, amDBPwd, amDBHost, amDBPort)

	am, err := NewDaiMgr(DaiCfg { amName, amNamespace, amDBUser, amDBPwd, amDBHost, amDBPort, nil })

	if err != nil || am == nil {

	if err != nil || am == nil {

		t.Fatalf("Failed to create Dai Manager")

		t.Fatalf("Failed to create Dai Manager")

	}

	}
@@ -918,7 +915,7 @@ func TestDaiMgrPutAppContext(t *testing.T) { 
	appLocation1[1] = LocationConstraintsItem{nil, &civicAddressElement1, nil}

	appLocation1[1] = LocationConstraintsItem{nil, &civicAddressElement1, nil}

	appCharcs1 := make([]AppCharcs, 1)

	appCharcs1 := make([]AppCharcs, 1)

	appCharcs1[0] = AppCharcs{&memory1, &storage1, &latency1, &bandwidth1, &serviceCont1}

	appCharcs1[0] = AppCharcs{&memory1, &storage1, &latency1, &bandwidth1, &serviceCont1}

	appInfoList1 := AppInfoList{appDId1, appName1, appProvider1, appSoftVersion1, appDVersion1, appDescription1, appLocation1, appCharcs1, appImage1, appCmd1}

	appInfoList1 := AppInfoList{appDId1, appName1, appProvider1, appSoftVersion1, appDVersion1, appDescription1, appLocation1, appCharcs1, appCmd1, []string{}}

	err = am.CreateAppEntry(appInfoList1)

	err = am.CreateAppEntry(appInfoList1)

	if err != nil {

	if err != nil {

		t.Fatalf(err.Error())

		t.Fatalf(err.Error())

scripts/build_all.sh

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ stop_advantedge() { 
	sleep $TIMEOUT

	sleep $TIMEOUT

	kubectl get pods --all-namespaces

	kubectl get pods --all-namespaces

	sleep $TIMEOUT

	sleep $TIMEOUT

    helm delete --no-hooks meep-prometheus

    #helm delete --no-hooks meep-prometheus

    fi

    fi

}

}