Skip to content

Commit 381f4ff

Browse files
mikejihbemikejihbe
committed
Add virtual network ACC tests
1 parent 3eb59a2 commit 381f4ff

File tree

2 files changed

+28
-33
lines changed

2 files changed

+28
-33
lines changed

‎data_source_obmcs_core_virtual_network_test.go‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,14 @@ func (s *ResourceCoreVirtualNetworksTestSuite) SetupTest() {
3535
"baremetal": s.Provider,
3636
}
3737
s.Config = `
38+
resource "baremetal_core_virtual_network" "t" {
39+
cidr_block = "10.0.0.0/16"
40+
compartment_id = "${var.compartment_id}"
41+
display_name = "display_name"
42+
}
3843
data "baremetal_core_virtual_networks" "t" {
39-
compartment_id = "${var.compartment_id}"
44+
compartment_id = "${baremetal_core_virtual_network.t.compartment_id}"
4045
limit = 1
41-
page = "page"
4246
}
4347
`
4448
s.Config += testProviderConfig()
@@ -58,7 +62,7 @@ func (s *ResourceCoreVirtualNetworksTestSuite) TestReadVirtualNetworks() {
5862
&baremetal.ListVirtualNetworks{
5963
VirtualNetworks: []baremetal.VirtualNetwork{
6064
{
61-
CidrBlock: "cidr_block",
65+
CidrBlock: "10.0.0.0/16",
6266
CompartmentID: "compartment_id",
6367
DefaultRouteTableID: "default_route_table_id",
6468
DefaultSecurityListID: "default_security_list_id",
@@ -67,16 +71,6 @@ func (s *ResourceCoreVirtualNetworksTestSuite) TestReadVirtualNetworks() {
6771
State: baremetal.ResourceAttached,
6872
TimeCreated: baremetal.Time{Time: time.Now()},
6973
},
70-
{
71-
CidrBlock: "cidr_block",
72-
CompartmentID: "compartment_id",
73-
DefaultRouteTableID: "default_route_table_id",
74-
DefaultSecurityListID: "default_security_list_id",
75-
DisplayName: "display_name",
76-
ID: "id2",
77-
State: baremetal.ResourceAttached,
78-
TimeCreated: baremetal.Time{Time: time.Now()},
79-
},
8074
},
8175
},
8276
nil,
@@ -91,13 +85,9 @@ func (s *ResourceCoreVirtualNetworksTestSuite) TestReadVirtualNetworks() {
9185
ImportStateVerify: true,
9286
Config: s.Config,
9387
Check: resource.ComposeTestCheckFunc(
94-
95-
resource.TestCheckResourceAttr(s.ResourceName, "limit", "1"),
96-
resource.TestCheckResourceAttr(s.ResourceName, "page", "page"),
97-
resource.TestCheckResourceAttr(s.ResourceName, "virtual_networks.0.cidr_block", "cidr_block"),
98-
resource.TestCheckResourceAttr(s.ResourceName, "virtual_networks.0.id", "id1"),
99-
resource.TestCheckResourceAttr(s.ResourceName, "virtual_networks.1.id", "id2"),
100-
resource.TestCheckResourceAttr(s.ResourceName, "virtual_networks.#", "2"),
88+
resource.TestCheckResourceAttr(s.ResourceName, "virtual_networks.0.cidr_block", "10.0.0.0/16"),
89+
resource.TestCheckResourceAttrSet(s.ResourceName, "virtual_networks.0.id"),
90+
resource.TestCheckResourceAttrSet(s.ResourceName, "virtual_networks.#"),
10191
),
10292
},
10393
},
@@ -108,6 +98,9 @@ func (s *ResourceCoreVirtualNetworksTestSuite) TestReadVirtualNetworks() {
10898
}
10999

110100
func (s *ResourceCoreVirtualNetworksTestSuite) TestReadVirtualNetworksWithPaging() {
101+
if IsAccTest() {
102+
s.T().Skip()
103+
}
111104
opts := &baremetal.ListOptions{}
112105
opts.Limit = 1
113106
opts.Page = "page"

‎resource_obmcs_core_virtual_network_test.go‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func (s *ResourceCoreVirtualNetworkTestSuite) SetupTest() {
4747

4848
s.Config = `
4949
resource "baremetal_core_virtual_network" "t" {
50-
cidr_block = "cidr_block"
50+
cidr_block = "10.0.0.0/16"
5151
compartment_id = "${var.compartment_id}"
5252
display_name = "display_name"
5353
}
@@ -57,7 +57,7 @@ func (s *ResourceCoreVirtualNetworkTestSuite) SetupTest() {
5757

5858
s.ResourceName = "baremetal_core_virtual_network.t"
5959
s.Res = &baremetal.VirtualNetwork{
60-
CidrBlock: "cidr_block",
60+
CidrBlock: "10.0.0.0/16",
6161
CompartmentID: "compartment_id",
6262
DefaultRouteTableID: "default_route_table_id",
6363
DefaultSecurityListID: "default_security_list_id",
@@ -70,7 +70,7 @@ func (s *ResourceCoreVirtualNetworkTestSuite) SetupTest() {
7070
s.Res.RequestID = "opcrequestid"
7171

7272
s.DeletingRes = &baremetal.VirtualNetwork{
73-
CidrBlock: "cidr_block",
73+
CidrBlock: "10.0.0.0/16",
7474
CompartmentID: "compartment_id",
7575
DefaultRouteTableID: "default_route_table_id",
7676
DefaultSecurityListID: "default_security_list_id",
@@ -81,7 +81,7 @@ func (s *ResourceCoreVirtualNetworkTestSuite) SetupTest() {
8181
}
8282

8383
s.DeletedRes = &baremetal.VirtualNetwork{
84-
CidrBlock: "cidr_block",
84+
CidrBlock: "10.0.0.0/16",
8585
CompartmentID: "compartment_id",
8686
DefaultRouteTableID: "default_route_table_id",
8787
DefaultSecurityListID: "default_security_list_id",
@@ -97,7 +97,7 @@ func (s *ResourceCoreVirtualNetworkTestSuite) SetupTest() {
9797
opts.DisplayName = "display_name"
9898
s.Client.On(
9999
"CreateVirtualNetwork",
100-
"cidr_block",
100+
"10.0.0.0/16",
101101
"compartment_id",
102102
opts).Return(s.Res, nil)
103103
s.Client.On("DeleteVirtualNetwork", "id", (*baremetal.IfMatchOptions)(nil)).Return(nil)
@@ -117,12 +117,11 @@ func (s *ResourceCoreVirtualNetworkTestSuite) TestCreateResourceCoreVirtualNetwo
117117
Check: resource.ComposeTestCheckFunc(
118118
resource.TestCheckResourceAttr(s.ResourceName, "cidr_block", s.Res.CidrBlock),
119119

120-
resource.TestCheckResourceAttr(s.ResourceName, "default_route_table_id", s.Res.DefaultRouteTableID),
121-
resource.TestCheckResourceAttr(s.ResourceName, "default_security_list_id", s.Res.DefaultSecurityListID),
120+
resource.TestCheckResourceAttrSet(s.ResourceName, "default_route_table_id"),
121+
resource.TestCheckResourceAttrSet(s.ResourceName, "default_security_list_id"),
122122
resource.TestCheckResourceAttr(s.ResourceName, "display_name", s.Res.DisplayName),
123-
resource.TestCheckResourceAttr(s.ResourceName, "id", s.Res.ID),
123+
resource.TestCheckResourceAttrSet(s.ResourceName, "id"),
124124
resource.TestCheckResourceAttr(s.ResourceName, "state", s.Res.State),
125-
resource.TestCheckResourceAttr(s.ResourceName, "time_created", s.Res.TimeCreated.String()),
126125
),
127126
},
128127
},
@@ -142,7 +141,7 @@ func (s *ResourceCoreVirtualNetworkTestSuite) TestDeleteResourceCoreVirtualNetwo
142141
ImportStateVerify: true,
143142
Config: s.Config,
144143
Check: resource.ComposeTestCheckFunc(
145-
resource.TestCheckResourceAttr(s.ResourceName, "id", s.Res.ID),
144+
resource.TestCheckResourceAttrSet(s.ResourceName, "id"),
146145
),
147146
},
148147
{
@@ -156,12 +155,15 @@ func (s *ResourceCoreVirtualNetworkTestSuite) TestDeleteResourceCoreVirtualNetwo
156155
}
157156

158157
func (s *ResourceCoreVirtualNetworkTestSuite) TestCreateResourceCoreVirtualNetworkWithoutDisplayName() {
158+
if IsAccTest() {
159+
s.T().Skip()
160+
}
159161
s.Client.On("GetVirtualNetwork", "id").Return(s.Res, nil).Times(2)
160162
s.Client.On("GetVirtualNetwork", "id").Return(s.DeletedRes, nil)
161163

162164
s.Config = `
163165
resource "baremetal_core_virtual_network" "t" {
164-
cidr_block = "cidr_block"
166+
cidr_block = "10.0.0.0/16"
165167
compartment_id = "${var.compartment_id}"
166168
}
167169
`
@@ -196,14 +198,14 @@ func (s ResourceCoreVirtualNetworkTestSuite) TestUpdateCidrBlockForcesNewVirtual
196198

197199
config := `
198200
resource "baremetal_core_virtual_network" "t" {
199-
cidr_block = "new_cidr_block"
201+
cidr_block = "10.0.0.0/24"
200202
compartment_id = "${var.compartment_id}"
201203
}
202204
`
203205
config += testProviderConfig()
204206

205207
res := &baremetal.VirtualNetwork{
206-
CidrBlock: "new_cidr_block",
208+
CidrBlock: "10.0.0.0/24",
207209
CompartmentID: "compartment_id",
208210
DefaultRouteTableID: "default_route_table_id",
209211
DefaultSecurityListID: "default_security_list_id",

0 commit comments

Comments
 (0)