mirror of
https://github.com/yunionio/cloudpods.git
synced 2026-09-01 15:07:17 +08:00
Merge pull request #244 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-network-create to release/2.2.0
* commit 'f0ad662ec0ef278c63f395ef4de291687528a22a': 修复获取network时未加认证信息
This commit is contained in:
@@ -247,6 +247,7 @@ func (self *SRegion) GetNetworkDetail(networkId string) (*Subnet, error) {
|
||||
if data := valid.FindStringSubmatch(networkId); len(data) == 4 {
|
||||
sunet := Subnet{}
|
||||
networkClient := network.NewSubnetsClientWithBaseURI(self.client.baseUrl, self.SubscriptionID)
|
||||
networkClient.Authorizer = self.client.authorizer
|
||||
if result, err := networkClient.Get(context.Background(), data[1], data[2], data[3], ""); err != nil {
|
||||
return nil, err
|
||||
} else if err := jsonutils.Update(&sunet, result); err != nil {
|
||||
|
||||
+12
-3
@@ -86,10 +86,19 @@ func (self *SRegion) createNetwork(vpc *SVpc, subnetName string, cidr string, de
|
||||
return nil, err
|
||||
} else if net, err := resp.Result(networkClient); err != nil {
|
||||
return nil, err
|
||||
} else if err := jsonutils.Update(&result, net); err != nil {
|
||||
return nil, err
|
||||
} else {
|
||||
for _, subnet := range *net.Subnets {
|
||||
_, _, _subnetName := pareResourceGroupWithName(*subnet.ID, VPC_RESOURCE)
|
||||
if _subnetName == subnetName {
|
||||
if err := jsonutils.Update(&result, subnet); err != nil {
|
||||
return nil, err
|
||||
} else {
|
||||
return &result, nil
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return &result, nil
|
||||
return nil, cloudprovider.ErrNotFound
|
||||
}
|
||||
|
||||
func (self *SWire) CreateINetwork(name string, cidr string, desc string) (cloudprovider.ICloudNetwork, error) {
|
||||
|
||||
Reference in New Issue
Block a user