Merge pull request #135 from linkernetworks/johnlin/bridgename

Johnlin/bridgename Former-commit-id: 8ccf714c81db6e0a57ac0f3bcbe0d325b039c5d8 [formerly 8ccf714c81db6e0a57ac0f3bcbe0d325b039c5d8 [formerly 6ce5303]] Former-commit-id: ce30753ed4085153adbbbde354f27ffdd800cf81 Former-commit-id: 94515fa
linkernetworks · Jul 20, 2018 · 3af25b8 · 3af25b8
2 parents 7aa4d5c + b253250
commit 3af25b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/networkprovider/network.go b/src/networkprovider/network.go
@@ -35,5 +35,5 @@ func GetNetworkProvider(network *entity.Network) (NetworkProvider, error) {
 func GenerateBridgeName(datapathType, networkName string) string {
 	tmp := fmt.Sprintf("%s%s", datapathType, networkName)
 	str := utils.SHA256String(tmp)
-	return fmt.Sprintf("ovs-%s-%s", datapathType, str[0:6])
+	return fmt.Sprintf("%s-%s", datapathType, str[0:6])
 }
diff --git a/src/networkprovider/network_test.go b/src/networkprovider/network_test.go
@@ -42,5 +42,5 @@ func TestGetNetworkProviderFail(t *testing.T) {
 
 func TestGenerateBridgeName(t *testing.T) {
 	ans := GenerateBridgeName("netdev", "my network 1")
-	assert.Equal(t, "ovs-netdev-de0165", ans)
+	assert.Equal(t, "netdev-de0165", ans)
 }