Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
30f1bf20
Commit
30f1bf20
authored
Apr 29, 2019
by
Pengfei Ni
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add unit tests
parent
34e898ac
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
47 additions
and
2 deletions
+47
-2
BUILD
staging/src/k8s.io/legacy-cloud-providers/azure/BUILD
+1
-0
azure_cache.go
...ng/src/k8s.io/legacy-cloud-providers/azure/azure_cache.go
+9
-0
azure_fakes.go
...ng/src/k8s.io/legacy-cloud-providers/azure/azure_fakes.go
+13
-1
azure_test.go
...ing/src/k8s.io/legacy-cloud-providers/azure/azure_test.go
+24
-1
No files found.
staging/src/k8s.io/legacy-cloud-providers/azure/BUILD
View file @
30f1bf20
...
@@ -100,6 +100,7 @@ go_test(
...
@@ -100,6 +100,7 @@ go_test(
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
"//staging/src/k8s.io/cloud-provider:go_default_library",
"//staging/src/k8s.io/cloud-provider:go_default_library",
"//staging/src/k8s.io/cloud-provider/service/helpers:go_default_library",
"//staging/src/k8s.io/cloud-provider/service/helpers:go_default_library",
"//staging/src/k8s.io/legacy-cloud-providers/azure/auth:go_default_library",
"//staging/src/k8s.io/legacy-cloud-providers/azure/auth:go_default_library",
...
...
staging/src/k8s.io/legacy-cloud-providers/azure/azure_cache.go
View file @
30f1bf20
...
@@ -122,3 +122,12 @@ func (t *timedCache) Delete(key string) error {
...
@@ -122,3 +122,12 @@ func (t *timedCache) Delete(key string) error {
key
:
key
,
key
:
key
,
})
})
}
}
// Set sets the data cache for the key.
// It is only used for testing.
func
(
t
*
timedCache
)
Set
(
key
string
,
data
interface
{})
{
t
.
store
.
Add
(
&
cacheEntry
{
key
:
key
,
data
:
data
,
})
}
staging/src/k8s.io/legacy-cloud-providers/azure/azure_fakes.go
View file @
30f1bf20
...
@@ -36,6 +36,10 @@ import (
...
@@ -36,6 +36,10 @@ import (
"github.com/Azure/go-autorest/autorest/to"
"github.com/Azure/go-autorest/autorest/to"
)
)
var
(
errPreconditionFailedEtagMismatch
=
fmt
.
Errorf
(
"PreconditionFailedEtagMismatch"
)
)
type
fakeAzureLBClient
struct
{
type
fakeAzureLBClient
struct
{
mutex
*
sync
.
Mutex
mutex
*
sync
.
Mutex
FakeStore
map
[
string
]
map
[
string
]
network
.
LoadBalancer
FakeStore
map
[
string
]
map
[
string
]
network
.
LoadBalancer
...
@@ -417,13 +421,21 @@ func newFakeAzureNSGClient() *fakeAzureNSGClient {
...
@@ -417,13 +421,21 @@ func newFakeAzureNSGClient() *fakeAzureNSGClient {
return
fNSG
return
fNSG
}
}
func
(
fNSG
*
fakeAzureNSGClient
)
CreateOrUpdate
(
ctx
context
.
Context
,
resourceGroupName
string
,
networkSecurityGroupName
string
,
parameters
network
.
SecurityGroup
)
(
resp
*
http
.
Response
,
err
error
)
{
func
(
fNSG
*
fakeAzureNSGClient
)
CreateOrUpdate
(
ctx
context
.
Context
,
resourceGroupName
string
,
networkSecurityGroupName
string
,
parameters
network
.
SecurityGroup
,
etag
string
)
(
resp
*
http
.
Response
,
err
error
)
{
fNSG
.
mutex
.
Lock
()
fNSG
.
mutex
.
Lock
()
defer
fNSG
.
mutex
.
Unlock
()
defer
fNSG
.
mutex
.
Unlock
()
if
_
,
ok
:=
fNSG
.
FakeStore
[
resourceGroupName
];
!
ok
{
if
_
,
ok
:=
fNSG
.
FakeStore
[
resourceGroupName
];
!
ok
{
fNSG
.
FakeStore
[
resourceGroupName
]
=
make
(
map
[
string
]
network
.
SecurityGroup
)
fNSG
.
FakeStore
[
resourceGroupName
]
=
make
(
map
[
string
]
network
.
SecurityGroup
)
}
}
if
nsg
,
ok
:=
fNSG
.
FakeStore
[
resourceGroupName
][
networkSecurityGroupName
];
ok
{
if
etag
!=
""
&&
to
.
String
(
nsg
.
Etag
)
!=
""
&&
etag
!=
to
.
String
(
nsg
.
Etag
)
{
return
&
http
.
Response
{
StatusCode
:
http
.
StatusPreconditionFailed
,
},
errPreconditionFailedEtagMismatch
}
}
fNSG
.
FakeStore
[
resourceGroupName
][
networkSecurityGroupName
]
=
parameters
fNSG
.
FakeStore
[
resourceGroupName
][
networkSecurityGroupName
]
=
parameters
return
nil
,
nil
return
nil
,
nil
...
...
staging/src/k8s.io/legacy-cloud-providers/azure/azure_test.go
View file @
30f1bf20
...
@@ -30,6 +30,7 @@ import (
...
@@ -30,6 +30,7 @@ import (
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/client-go/tools/record"
servicehelpers
"k8s.io/cloud-provider/service/helpers"
servicehelpers
"k8s.io/cloud-provider/service/helpers"
"k8s.io/legacy-cloud-providers/azure/auth"
"k8s.io/legacy-cloud-providers/azure/auth"
...
@@ -855,6 +856,25 @@ func TestReconcileSecurityWithSourceRanges(t *testing.T) {
...
@@ -855,6 +856,25 @@ func TestReconcileSecurityWithSourceRanges(t *testing.T) {
validateSecurityGroup
(
t
,
sg
,
svc
)
validateSecurityGroup
(
t
,
sg
,
svc
)
}
}
func
TestReconcileSecurityGroupEtagMismatch
(
t
*
testing
.
T
)
{
az
:=
getTestCloud
()
sg
:=
getTestSecurityGroup
(
az
)
cachedSG
:=
*
sg
cachedSG
.
Etag
=
to
.
StringPtr
(
"1111111-0000-0000-0000-000000000000"
)
az
.
nsgCache
.
Set
(
to
.
String
(
sg
.
Name
),
&
cachedSG
)
svc1
:=
getTestService
(
"servicea"
,
v1
.
ProtocolTCP
,
80
)
clusterResources
:=
getClusterResources
(
az
,
1
,
1
)
lb
,
_
:=
az
.
reconcileLoadBalancer
(
testClusterName
,
&
svc1
,
clusterResources
.
nodes
,
true
)
lbStatus
,
_
:=
az
.
getServiceLoadBalancerStatus
(
&
svc1
,
lb
)
newSG
,
err
:=
az
.
reconcileSecurityGroup
(
testClusterName
,
&
svc1
,
&
lbStatus
.
Ingress
[
0
]
.
IP
,
true
/* wantLb */
)
assert
.
Nil
(
t
,
newSG
)
assert
.
NotNil
(
t
,
err
)
assert
.
Equal
(
t
,
err
,
errPreconditionFailedEtagMismatch
)
}
func
TestReconcilePublicIPWithNewService
(
t
*
testing
.
T
)
{
func
TestReconcilePublicIPWithNewService
(
t
*
testing
.
T
)
{
az
:=
getTestCloud
()
az
:=
getTestCloud
()
svc
:=
getTestService
(
"servicea"
,
v1
.
ProtocolTCP
,
80
,
443
)
svc
:=
getTestService
(
"servicea"
,
v1
.
ProtocolTCP
,
80
,
443
)
...
@@ -958,6 +978,7 @@ func getTestCloud() (az *Cloud) {
...
@@ -958,6 +978,7 @@ func getTestCloud() (az *Cloud) {
nodeResourceGroups
:
map
[
string
]
string
{},
nodeResourceGroups
:
map
[
string
]
string
{},
unmanagedNodes
:
sets
.
NewString
(),
unmanagedNodes
:
sets
.
NewString
(),
routeCIDRs
:
map
[
string
]
string
{},
routeCIDRs
:
map
[
string
]
string
{},
eventRecorder
:
&
record
.
FakeRecorder
{},
}
}
az
.
DisksClient
=
newFakeDisksClient
()
az
.
DisksClient
=
newFakeDisksClient
()
az
.
InterfacesClient
=
newFakeAzureInterfacesClient
()
az
.
InterfacesClient
=
newFakeAzureInterfacesClient
()
...
@@ -1186,6 +1207,7 @@ func getTestSecurityGroup(az *Cloud, services ...v1.Service) *network.SecurityGr
...
@@ -1186,6 +1207,7 @@ func getTestSecurityGroup(az *Cloud, services ...v1.Service) *network.SecurityGr
sg
:=
network
.
SecurityGroup
{
sg
:=
network
.
SecurityGroup
{
Name
:
&
az
.
SecurityGroupName
,
Name
:
&
az
.
SecurityGroupName
,
Etag
:
to
.
StringPtr
(
"0000000-0000-0000-0000-000000000000"
),
SecurityGroupPropertiesFormat
:
&
network
.
SecurityGroupPropertiesFormat
{
SecurityGroupPropertiesFormat
:
&
network
.
SecurityGroupPropertiesFormat
{
SecurityRules
:
&
rules
,
SecurityRules
:
&
rules
,
},
},
...
@@ -1197,7 +1219,8 @@ func getTestSecurityGroup(az *Cloud, services ...v1.Service) *network.SecurityGr
...
@@ -1197,7 +1219,8 @@ func getTestSecurityGroup(az *Cloud, services ...v1.Service) *network.SecurityGr
ctx
,
ctx
,
az
.
ResourceGroup
,
az
.
ResourceGroup
,
az
.
SecurityGroupName
,
az
.
SecurityGroupName
,
sg
)
sg
,
""
)
return
&
sg
return
&
sg
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment