Remove trailing spaces, convert dos2unix
These are issues that pre-commit identified. Address them now. Signed-off-by: Stephen Finucane <stephenfin@redhat.com> Change-Id: I19f7d3689a000c41787b3fe15632564928bbf6a6
This commit is contained in:
Stephen Finucane
parent
bc70c12b89
commit
23e6493dee
|
|
@ -2383,7 +2383,7 @@ required_extra_specs:
|
|||
description: |
|
||||
The required extra specifications for the share
|
||||
type: ``driver_handles_share_servers``. ``snapshot_support`` was
|
||||
treated as a required extra-specification until
|
||||
treated as a required extra-specification until
|
||||
api version 2.24.
|
||||
in: body
|
||||
required: true
|
||||
|
|
|
|||
|
|
@ -1,26 +1,26 @@
|
|||
{
|
||||
"share_network": {
|
||||
"name": "net2",
|
||||
"created_at": "2019-11-10T12:31:12.000000",
|
||||
"updated_at": null,
|
||||
"id": "d8ae6799-2567-4a89-aafb-fa4424350d2b",
|
||||
"project_id": "16e1ab15c35a457e9c2b2aa189f544e1",
|
||||
"description": null,
|
||||
"share_network_subnets": [
|
||||
{
|
||||
"id": "e4db03dc-6041-4c6a-a8f9-80bb4141a1eb",
|
||||
"availability_zone": null,
|
||||
"created_at": "2019-11-10T12:31:12.000000",
|
||||
"updated_at": "2019-11-10T12:31:12.000000",
|
||||
"segmentation_id": null,
|
||||
"neutron_net_id": "62187648-6617-4509-a780-ffc973a7fe43",
|
||||
"neutron_subnet_id": "2276888a-27c1-47c2-82a0-ea33050128b5",
|
||||
"ip_version": 4,
|
||||
"cidr": "172.24.5.0/24",
|
||||
"network_type": "flat",
|
||||
"mtu": 1500,
|
||||
"gateway": "172.24.5.1"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
{
|
||||
"share_network": {
|
||||
"name": "net2",
|
||||
"created_at": "2019-11-10T12:31:12.000000",
|
||||
"updated_at": null,
|
||||
"id": "d8ae6799-2567-4a89-aafb-fa4424350d2b",
|
||||
"project_id": "16e1ab15c35a457e9c2b2aa189f544e1",
|
||||
"description": null,
|
||||
"share_network_subnets": [
|
||||
{
|
||||
"id": "e4db03dc-6041-4c6a-a8f9-80bb4141a1eb",
|
||||
"availability_zone": null,
|
||||
"created_at": "2019-11-10T12:31:12.000000",
|
||||
"updated_at": "2019-11-10T12:31:12.000000",
|
||||
"segmentation_id": null,
|
||||
"neutron_net_id": "62187648-6617-4509-a780-ffc973a7fe43",
|
||||
"neutron_subnet_id": "2276888a-27c1-47c2-82a0-ea33050128b5",
|
||||
"ip_version": 4,
|
||||
"cidr": "172.24.5.0/24",
|
||||
"network_type": "flat",
|
||||
"mtu": 1500,
|
||||
"gateway": "172.24.5.1"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,28 +1,28 @@
|
|||
{
|
||||
"share_network": {
|
||||
"name": "my_network",
|
||||
"created_at": "2019-09-07T14:37:00.583656",
|
||||
"updated_at": null,
|
||||
"id": "77eb3421-4549-4789-ac39-0d5185d68c29",
|
||||
"project_id": "e10a683c20da41248cfd5e1ab3d88c62",
|
||||
"description": "This is my share network",
|
||||
"security_service_update_support": true,
|
||||
"status": "active",
|
||||
"share_network_subnets": [
|
||||
{
|
||||
"id": "91cc63b5-6c61-4078-b054-560923709654",
|
||||
"availability_zone": "manila-zone-0",
|
||||
"created_at": "2019-10-04T20:49:11.000000",
|
||||
"updated_at": null,
|
||||
"segmentation_id": null,
|
||||
"neutron_net_id": "998b42ee-2cee-4d36-8b95-67b5ca1f2109",
|
||||
"neutron_subnet_id": "53482b62-2c84-4a53-b6ab-30d9d9800d06",
|
||||
"ip_version": null,
|
||||
"cidr": null,
|
||||
"network_type": null,
|
||||
"mtu": null,
|
||||
"gateway": null
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
{
|
||||
"share_network": {
|
||||
"name": "my_network",
|
||||
"created_at": "2019-09-07T14:37:00.583656",
|
||||
"updated_at": null,
|
||||
"id": "77eb3421-4549-4789-ac39-0d5185d68c29",
|
||||
"project_id": "e10a683c20da41248cfd5e1ab3d88c62",
|
||||
"description": "This is my share network",
|
||||
"security_service_update_support": true,
|
||||
"status": "active",
|
||||
"share_network_subnets": [
|
||||
{
|
||||
"id": "91cc63b5-6c61-4078-b054-560923709654",
|
||||
"availability_zone": "manila-zone-0",
|
||||
"created_at": "2019-10-04T20:49:11.000000",
|
||||
"updated_at": null,
|
||||
"segmentation_id": null,
|
||||
"neutron_net_id": "998b42ee-2cee-4d36-8b95-67b5ca1f2109",
|
||||
"neutron_subnet_id": "53482b62-2c84-4a53-b6ab-30d9d9800d06",
|
||||
"ip_version": null,
|
||||
"cidr": null,
|
||||
"network_type": null,
|
||||
"mtu": null,
|
||||
"gateway": null
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,28 +1,28 @@
|
|||
{
|
||||
"share_network": {
|
||||
"name": "net2",
|
||||
"created_at": "2019-11-07T12:31:12.000000",
|
||||
"updated_at": null,
|
||||
"id": "d8ae6799-2567-4a89-aafb-fa4424350d2b",
|
||||
"project_id": "16e1ab15c35a457e9c2b2aa189f544e1",
|
||||
"description": null,
|
||||
"security_service_update_support": true,
|
||||
"status": "active",
|
||||
"share_network_subnets": [
|
||||
{
|
||||
"id": "e4db03dc-6041-4c6a-a8f9-80bb4141a1eb",
|
||||
"availability_zone": null,
|
||||
"created_at": "2019-11-07T12:31:12.000000",
|
||||
"updated_at": "2019-12-12T12:31:12.000000",
|
||||
"segmentation_id": null,
|
||||
"neutron_net_id": "62187648-6617-4509-a780-ffc973a7fe43",
|
||||
"neutron_subnet_id": "2276888a-27c1-47c2-82a0-ea33050128b5",
|
||||
"ip_version": 4,
|
||||
"cidr": "172.24.5.0/24",
|
||||
"network_type": "flat",
|
||||
"mtu": 1500,
|
||||
"gateway": "172.24.5.1"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
{
|
||||
"share_network": {
|
||||
"name": "net2",
|
||||
"created_at": "2019-11-07T12:31:12.000000",
|
||||
"updated_at": null,
|
||||
"id": "d8ae6799-2567-4a89-aafb-fa4424350d2b",
|
||||
"project_id": "16e1ab15c35a457e9c2b2aa189f544e1",
|
||||
"description": null,
|
||||
"security_service_update_support": true,
|
||||
"status": "active",
|
||||
"share_network_subnets": [
|
||||
{
|
||||
"id": "e4db03dc-6041-4c6a-a8f9-80bb4141a1eb",
|
||||
"availability_zone": null,
|
||||
"created_at": "2019-11-07T12:31:12.000000",
|
||||
"updated_at": "2019-12-12T12:31:12.000000",
|
||||
"segmentation_id": null,
|
||||
"neutron_net_id": "62187648-6617-4509-a780-ffc973a7fe43",
|
||||
"neutron_subnet_id": "2276888a-27c1-47c2-82a0-ea33050128b5",
|
||||
"ip_version": 4,
|
||||
"cidr": "172.24.5.0/24",
|
||||
"network_type": "flat",
|
||||
"mtu": 1500,
|
||||
"gateway": "172.24.5.1"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,27 +1,27 @@
|
|||
{
|
||||
"share_network": {
|
||||
"id": "1324e7d3-fba8-45e4-bb37-b59c12eb06dc",
|
||||
"name": "net_my1",
|
||||
"project_id": "16e1ab15c35a457e9c2b2aa189f544e1",
|
||||
"created_at": "2019-10-02T17:49:43.000000",
|
||||
"description": null,
|
||||
"security_service_update_support": true,
|
||||
"status": "active",
|
||||
"share_network_subnets": [
|
||||
{
|
||||
"id": "e4db03dc-6041-4c6a-a8f9-80bb4141a1eb",
|
||||
"availability_zone": null,
|
||||
"created_at": "2019-10-02T17:49:43.000000",
|
||||
"updated_at": "2019-10-03T12:17:39.000000",
|
||||
"segmentation_id": null,
|
||||
"neutron_net_id": "62187648-6617-4509-a780-ffc973a7fe43",
|
||||
"neutron_subnet_id": "2276888a-27c1-47c2-82a0-ea33050128b5",
|
||||
"ip_version": 4,
|
||||
"cidr": "172.24.5.0/24",
|
||||
"network_type": "flat",
|
||||
"mtu": 1500,
|
||||
"gateway": "172.24.5.1"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
{
|
||||
"share_network": {
|
||||
"id": "1324e7d3-fba8-45e4-bb37-b59c12eb06dc",
|
||||
"name": "net_my1",
|
||||
"project_id": "16e1ab15c35a457e9c2b2aa189f544e1",
|
||||
"created_at": "2019-10-02T17:49:43.000000",
|
||||
"description": null,
|
||||
"security_service_update_support": true,
|
||||
"status": "active",
|
||||
"share_network_subnets": [
|
||||
{
|
||||
"id": "e4db03dc-6041-4c6a-a8f9-80bb4141a1eb",
|
||||
"availability_zone": null,
|
||||
"created_at": "2019-10-02T17:49:43.000000",
|
||||
"updated_at": "2019-10-03T12:17:39.000000",
|
||||
"segmentation_id": null,
|
||||
"neutron_net_id": "62187648-6617-4509-a780-ffc973a7fe43",
|
||||
"neutron_subnet_id": "2276888a-27c1-47c2-82a0-ea33050128b5",
|
||||
"ip_version": 4,
|
||||
"cidr": "172.24.5.0/24",
|
||||
"network_type": "flat",
|
||||
"mtu": 1500,
|
||||
"gateway": "172.24.5.1"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"share-network-subnet": {
|
||||
"neutron_net_id": "62187648-6617-4509-a780-ffc973a7fe43",
|
||||
"neutron_subnet_id": "2276888a-27c1-47c2-82a0-ea33050128b5",
|
||||
"availability_zone": "manila-zone-0"
|
||||
}
|
||||
}
|
||||
{
|
||||
"share-network-subnet": {
|
||||
"neutron_net_id": "62187648-6617-4509-a780-ffc973a7fe43",
|
||||
"neutron_subnet_id": "2276888a-27c1-47c2-82a0-ea33050128b5",
|
||||
"availability_zone": "manila-zone-0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{
|
||||
"share_network_subnet": {
|
||||
"id": "8ebe964d-ac48-4e43-93ed-b1768148f8f4",
|
||||
"availability_zone": "manila-zone-0",
|
||||
"share_network_id": "1324e7d3-fba8-45e4-bb37-b59c12eb06dc",
|
||||
"share_network_name": "net_my1",
|
||||
"created_at": "2019-10-03T02:25:12.000000",
|
||||
"segmentation_id": null,
|
||||
"neutron_subnet_id": "2276888a-27c1-47c2-82a0-ea33050128b5",
|
||||
"updated_at": null,
|
||||
"neutron_net_id": "62187648-6617-4509-a780-ffc973a7fe43",
|
||||
"ip_version": null,
|
||||
"cidr": null,
|
||||
"network_type": null,
|
||||
"mtu": null,
|
||||
"gateway": null
|
||||
}
|
||||
}
|
||||
{
|
||||
"share_network_subnet": {
|
||||
"id": "8ebe964d-ac48-4e43-93ed-b1768148f8f4",
|
||||
"availability_zone": "manila-zone-0",
|
||||
"share_network_id": "1324e7d3-fba8-45e4-bb37-b59c12eb06dc",
|
||||
"share_network_name": "net_my1",
|
||||
"created_at": "2019-10-03T02:25:12.000000",
|
||||
"segmentation_id": null,
|
||||
"neutron_subnet_id": "2276888a-27c1-47c2-82a0-ea33050128b5",
|
||||
"updated_at": null,
|
||||
"neutron_net_id": "62187648-6617-4509-a780-ffc973a7fe43",
|
||||
"ip_version": null,
|
||||
"cidr": null,
|
||||
"network_type": null,
|
||||
"mtu": null,
|
||||
"gateway": null
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,36 +1,36 @@
|
|||
{
|
||||
"share_network_subnets": [
|
||||
{
|
||||
"id": "a7507a16-98bb-476c-ba90-487e4b4775fa",
|
||||
"availability_zone": null,
|
||||
"share_network_id": "8bc488d8-52f7-46cb-91b1-89dd92cae972",
|
||||
"share_network_name": "sn_test",
|
||||
"created_at": "2019-10-03T18:30:15.000000",
|
||||
"segmentation_id": null,
|
||||
"neutron_subnet_id": "dc0a37f0-81b0-4eb5-aad8-deffda5ff4ca",
|
||||
"updated_at": null,
|
||||
"neutron_net_id": "70bc8f03-525c-4334-a51b-261a024681c5",
|
||||
"ip_version": 4,
|
||||
"cidr": "10.190.5.0/24",
|
||||
"network_type": "flat",
|
||||
"mtu": 1500,
|
||||
"gateway": "10.190.5.1"
|
||||
},
|
||||
{
|
||||
"id": "8ebe964d-ac48-4e43-93ed-b1768148f8f4",
|
||||
"availability_zone": "manila-zone-0",
|
||||
"share_network_id": "8bc488d8-52f7-46cb-91b1-89dd92cae972",
|
||||
"share_network_name": "sn_test",
|
||||
"created_at": "2019-10-02T01:35:10.000000",
|
||||
"segmentation_id": null,
|
||||
"neutron_subnet_id": "2276888a-27c1-47c2-82a0-ea33050128b5",
|
||||
"updated_at": null,
|
||||
"neutron_net_id": "62187648-6617-4509-a780-ffc973a7fe43",
|
||||
"ip_version": 4,
|
||||
"cidr": "172.24.5.0/24",
|
||||
"network_type": "flat",
|
||||
"mtu": 1500,
|
||||
"gateway": "172.24.5.1"
|
||||
}
|
||||
]
|
||||
}
|
||||
{
|
||||
"share_network_subnets": [
|
||||
{
|
||||
"id": "a7507a16-98bb-476c-ba90-487e4b4775fa",
|
||||
"availability_zone": null,
|
||||
"share_network_id": "8bc488d8-52f7-46cb-91b1-89dd92cae972",
|
||||
"share_network_name": "sn_test",
|
||||
"created_at": "2019-10-03T18:30:15.000000",
|
||||
"segmentation_id": null,
|
||||
"neutron_subnet_id": "dc0a37f0-81b0-4eb5-aad8-deffda5ff4ca",
|
||||
"updated_at": null,
|
||||
"neutron_net_id": "70bc8f03-525c-4334-a51b-261a024681c5",
|
||||
"ip_version": 4,
|
||||
"cidr": "10.190.5.0/24",
|
||||
"network_type": "flat",
|
||||
"mtu": 1500,
|
||||
"gateway": "10.190.5.1"
|
||||
},
|
||||
{
|
||||
"id": "8ebe964d-ac48-4e43-93ed-b1768148f8f4",
|
||||
"availability_zone": "manila-zone-0",
|
||||
"share_network_id": "8bc488d8-52f7-46cb-91b1-89dd92cae972",
|
||||
"share_network_name": "sn_test",
|
||||
"created_at": "2019-10-02T01:35:10.000000",
|
||||
"segmentation_id": null,
|
||||
"neutron_subnet_id": "2276888a-27c1-47c2-82a0-ea33050128b5",
|
||||
"updated_at": null,
|
||||
"neutron_net_id": "62187648-6617-4509-a780-ffc973a7fe43",
|
||||
"ip_version": 4,
|
||||
"cidr": "172.24.5.0/24",
|
||||
"network_type": "flat",
|
||||
"mtu": 1500,
|
||||
"gateway": "172.24.5.1"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{
|
||||
"share_network_subnet": {
|
||||
"id": "e4db03dc-6041-4c6a-a8f9-80bb4141a1eb",
|
||||
"availability_zone": null,
|
||||
"share_network_id":"1324e7d3-fba8-45e4-bb37-b59c12eb06dc",
|
||||
"share_network_name": "net_my1",
|
||||
"created_at": "2019-10-01T17:49:43.000000",
|
||||
"segmentation_id": null,
|
||||
"neutron_subnet_id": "2276888a-27c1-47c2-82a0-ea33050128b5",
|
||||
"updated_at": "2019-11-02T12:17:39.000000",
|
||||
"neutron_net_id": "62187648-6617-4509-a780-ffc973a7fe43",
|
||||
"ip_version": 4,
|
||||
"cidr": "172.24.5.0/24",
|
||||
"network_type": "flat",
|
||||
"mtu": 1500,
|
||||
"gateway": "172.24.5.1"
|
||||
}
|
||||
}
|
||||
{
|
||||
"share_network_subnet": {
|
||||
"id": "e4db03dc-6041-4c6a-a8f9-80bb4141a1eb",
|
||||
"availability_zone": null,
|
||||
"share_network_id":"1324e7d3-fba8-45e4-bb37-b59c12eb06dc",
|
||||
"share_network_name": "net_my1",
|
||||
"created_at": "2019-10-01T17:49:43.000000",
|
||||
"segmentation_id": null,
|
||||
"neutron_subnet_id": "2276888a-27c1-47c2-82a0-ea33050128b5",
|
||||
"updated_at": "2019-11-02T12:17:39.000000",
|
||||
"neutron_net_id": "62187648-6617-4509-a780-ffc973a7fe43",
|
||||
"ip_version": 4,
|
||||
"cidr": "172.24.5.0/24",
|
||||
"network_type": "flat",
|
||||
"mtu": 1500,
|
||||
"gateway": "172.24.5.1"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,28 +1,28 @@
|
|||
{
|
||||
"share_network":{
|
||||
"id": "2b33cd3a-3049-4f36-a2fd-f7a211eb9202",
|
||||
"name": "update my network",
|
||||
"project_id": "79ed3be75dbb4d03afd687b758fcc2c0",
|
||||
"created_at": "2019-11-12T17:18:10.000000",
|
||||
"updated_at": null,
|
||||
"description": "i'm adding a description",
|
||||
"security_service_update_support": true,
|
||||
"status": "active",
|
||||
"share_network_subnets": [
|
||||
{
|
||||
"id": "687ab361-5c40-406e-945c-6326254782d4",
|
||||
"availability_zone": null,
|
||||
"created_at": "2019-11-13T17:18:10.000000",
|
||||
"updated_at": "2019-11-13T17:18:56.000000",
|
||||
"segmentation_id": null,
|
||||
"neutron_net_id": "998b42ee-2cee-4d36-8b95-67b5ca1f2109",
|
||||
"neutron_subnet_id": "53482b62-2c84-4a53-b6ab-30d9d9800d06",
|
||||
"ip_version": 4,
|
||||
"cidr": "172.24.5.0/24",
|
||||
"network_type": "flat",
|
||||
"mtu": 1500,
|
||||
"gateway": "172.24.5.1"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
{
|
||||
"share_network":{
|
||||
"id": "2b33cd3a-3049-4f36-a2fd-f7a211eb9202",
|
||||
"name": "update my network",
|
||||
"project_id": "79ed3be75dbb4d03afd687b758fcc2c0",
|
||||
"created_at": "2019-11-12T17:18:10.000000",
|
||||
"updated_at": null,
|
||||
"description": "i'm adding a description",
|
||||
"security_service_update_support": true,
|
||||
"status": "active",
|
||||
"share_network_subnets": [
|
||||
{
|
||||
"id": "687ab361-5c40-406e-945c-6326254782d4",
|
||||
"availability_zone": null,
|
||||
"created_at": "2019-11-13T17:18:10.000000",
|
||||
"updated_at": "2019-11-13T17:18:56.000000",
|
||||
"segmentation_id": null,
|
||||
"neutron_net_id": "998b42ee-2cee-4d36-8b95-67b5ca1f2109",
|
||||
"neutron_subnet_id": "53482b62-2c84-4a53-b6ab-30d9d9800d06",
|
||||
"ip_version": 4,
|
||||
"cidr": "172.24.5.0/24",
|
||||
"network_type": "flat",
|
||||
"mtu": 1500,
|
||||
"gateway": "172.24.5.1"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,66 +1,66 @@
|
|||
{
|
||||
"share_networks": [
|
||||
{
|
||||
"id": "03987b5f-cb79-4f5f-a590-f6936b91b49e",
|
||||
"name": "net_my1",
|
||||
"project_id": "16e1ab15c35a457e9c2b2aa189f544e1",
|
||||
"created_at": "2019-10-02T12:33:36.000000",
|
||||
"updated_at": null,
|
||||
"description": null,
|
||||
"share_network_subnets": [
|
||||
{
|
||||
"id": "022aa495-845e-42a6-9d83-a38f164053c9",
|
||||
"availability_zone": null,
|
||||
"created_at": "2019-10-02T12:33:36.000000",
|
||||
"updated_at": null,
|
||||
"segmentation_id": null,
|
||||
"neutron_net_id": "f00732aa-7721-455d-ba14-ec37619ea13f",
|
||||
"neutron_subnet_id": "eb7adcf8-ce71-43e3-b4c2-cf81da9f89a",
|
||||
"ip_version": null,
|
||||
"cidr": null,
|
||||
"network_type": null,
|
||||
"mtu": null,
|
||||
"gateway": null
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "1324e7d3-fba8-45e4-bb37-b59c12eb06dc",
|
||||
"name": "net_my2",
|
||||
"project_id": "16e1ab15c35a457e9c2b2aa189f544e1",
|
||||
"created_at": "2019-07-01T17:49:43.000000",
|
||||
"updated_at": "2019-07-02T12:17:39.000000",
|
||||
"description": null,
|
||||
"share_network_subnets": [
|
||||
{
|
||||
"id": "8ebe964d-ac48-4e43-93ed-b1768148f8f4",
|
||||
"availability_zone": "manila-zone-0",
|
||||
"created_at": "2019-10-03T02:25:12.000000",
|
||||
"updated_at": null,
|
||||
"segmentation_id": null,
|
||||
"neutron_net_id": "62187648-6617-4509-a780-ffc973a7fe43",
|
||||
"neutron_subnet_id": "2276888a-27c1-47c2-82a0-ea3050128b5",
|
||||
"ip_version": null,
|
||||
"cidr": null,
|
||||
"network_type": null,
|
||||
"mtu": null,
|
||||
"gateway": null
|
||||
},
|
||||
{
|
||||
"id": "e4db03dc-6041-4c6a-a8f9-80bb4141a1eb",
|
||||
"availability_zone": null,
|
||||
"created_at": "2019-07-01T17:49:43.000000",
|
||||
"updated_at": "2019-07-02T12:17:39.000000",
|
||||
"segmentation_id": null,
|
||||
"neutron_net_id": "62187648-6617-4509-a780-ffc973a7fe43",
|
||||
"neutron_subnet_id": "2276888a-27c1-47c2-820-ea33050128b5",
|
||||
"ip_version": 4,
|
||||
"cidr": "172.24.5.0/24",
|
||||
"network_type": "flat",
|
||||
"mtu": 1500,
|
||||
"gateway": "172.24.5.1"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
{
|
||||
"share_networks": [
|
||||
{
|
||||
"id": "03987b5f-cb79-4f5f-a590-f6936b91b49e",
|
||||
"name": "net_my1",
|
||||
"project_id": "16e1ab15c35a457e9c2b2aa189f544e1",
|
||||
"created_at": "2019-10-02T12:33:36.000000",
|
||||
"updated_at": null,
|
||||
"description": null,
|
||||
"share_network_subnets": [
|
||||
{
|
||||
"id": "022aa495-845e-42a6-9d83-a38f164053c9",
|
||||
"availability_zone": null,
|
||||
"created_at": "2019-10-02T12:33:36.000000",
|
||||
"updated_at": null,
|
||||
"segmentation_id": null,
|
||||
"neutron_net_id": "f00732aa-7721-455d-ba14-ec37619ea13f",
|
||||
"neutron_subnet_id": "eb7adcf8-ce71-43e3-b4c2-cf81da9f89a",
|
||||
"ip_version": null,
|
||||
"cidr": null,
|
||||
"network_type": null,
|
||||
"mtu": null,
|
||||
"gateway": null
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "1324e7d3-fba8-45e4-bb37-b59c12eb06dc",
|
||||
"name": "net_my2",
|
||||
"project_id": "16e1ab15c35a457e9c2b2aa189f544e1",
|
||||
"created_at": "2019-07-01T17:49:43.000000",
|
||||
"updated_at": "2019-07-02T12:17:39.000000",
|
||||
"description": null,
|
||||
"share_network_subnets": [
|
||||
{
|
||||
"id": "8ebe964d-ac48-4e43-93ed-b1768148f8f4",
|
||||
"availability_zone": "manila-zone-0",
|
||||
"created_at": "2019-10-03T02:25:12.000000",
|
||||
"updated_at": null,
|
||||
"segmentation_id": null,
|
||||
"neutron_net_id": "62187648-6617-4509-a780-ffc973a7fe43",
|
||||
"neutron_subnet_id": "2276888a-27c1-47c2-82a0-ea3050128b5",
|
||||
"ip_version": null,
|
||||
"cidr": null,
|
||||
"network_type": null,
|
||||
"mtu": null,
|
||||
"gateway": null
|
||||
},
|
||||
{
|
||||
"id": "e4db03dc-6041-4c6a-a8f9-80bb4141a1eb",
|
||||
"availability_zone": null,
|
||||
"created_at": "2019-07-01T17:49:43.000000",
|
||||
"updated_at": "2019-07-02T12:17:39.000000",
|
||||
"segmentation_id": null,
|
||||
"neutron_net_id": "62187648-6617-4509-a780-ffc973a7fe43",
|
||||
"neutron_subnet_id": "2276888a-27c1-47c2-820-ea33050128b5",
|
||||
"ip_version": 4,
|
||||
"cidr": "172.24.5.0/24",
|
||||
"network_type": "flat",
|
||||
"mtu": 1500,
|
||||
"gateway": "172.24.5.1"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
"migration_cancel":null
|
||||
}
|
||||
{
|
||||
"migration_cancel":null
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"migration_check": {
|
||||
"host": "foohost2@backend2",
|
||||
"preserve_snapshots": "True",
|
||||
"writable": "True",
|
||||
"nondisruptive": "True",
|
||||
"new_share_network_id": null
|
||||
}
|
||||
}
|
||||
{
|
||||
"migration_check": {
|
||||
"host": "foohost2@backend2",
|
||||
"preserve_snapshots": "True",
|
||||
"writable": "True",
|
||||
"nondisruptive": "True",
|
||||
"new_share_network_id": null
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{
|
||||
"compatible": false,
|
||||
"requested_capabilities": {
|
||||
"writable": "True",
|
||||
"nondisruptive": "True",
|
||||
"preserve_snapshots": "True",
|
||||
"share_network_id": null,
|
||||
"host": "foohost2@backend2"
|
||||
},
|
||||
"supported_capabilities": {
|
||||
"writable": true,
|
||||
"nondisruptive": false,
|
||||
"preserve_snapshots": true,
|
||||
"share_network_id": "1d04b755-649f-46a4-964c-be9f0395af13",
|
||||
"migration_cancel": true,
|
||||
"migration_get_progress": true
|
||||
}
|
||||
}
|
||||
{
|
||||
"compatible": false,
|
||||
"requested_capabilities": {
|
||||
"writable": "True",
|
||||
"nondisruptive": "True",
|
||||
"preserve_snapshots": "True",
|
||||
"share_network_id": null,
|
||||
"host": "foohost2@backend2"
|
||||
},
|
||||
"supported_capabilities": {
|
||||
"writable": true,
|
||||
"nondisruptive": false,
|
||||
"preserve_snapshots": true,
|
||||
"share_network_id": "1d04b755-649f-46a4-964c-be9f0395af13",
|
||||
"migration_cancel": true,
|
||||
"migration_get_progress": true
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
"migration_complete": null
|
||||
}
|
||||
{
|
||||
"migration_complete": null
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
"destination_share_server_id": "c2f71561-85e2-4ccb-a91a-e44f9ff6f7ef"
|
||||
}
|
||||
{
|
||||
"destination_share_server_id": "c2f71561-85e2-4ccb-a91a-e44f9ff6f7ef"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
"migration_get_progress": null
|
||||
}
|
||||
{
|
||||
"migration_get_progress": null
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"total_progress": 50,
|
||||
"task_state": "migration_driver_in_progress",
|
||||
"destination_share_server_id": "c2f71561-85e2-4ccb-a91a-e44f9ff6f7ef"
|
||||
}
|
||||
{
|
||||
"total_progress": 50,
|
||||
"task_state": "migration_driver_in_progress",
|
||||
"destination_share_server_id": "c2f71561-85e2-4ccb-a91a-e44f9ff6f7ef"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"migration_start": {
|
||||
"host": "foohost2@backend2",
|
||||
"preserve_snapshots": "True",
|
||||
"writable": "True",
|
||||
"nondisruptive": "False",
|
||||
"new_share_network_id": null
|
||||
}
|
||||
}
|
||||
{
|
||||
"migration_start": {
|
||||
"host": "foohost2@backend2",
|
||||
"preserve_snapshots": "True",
|
||||
"writable": "True",
|
||||
"nondisruptive": "False",
|
||||
"new_share_network_id": null
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,44 +1,44 @@
|
|||
# Copyright (c) 2022 MacroSAN Technologies Co., Ltd.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
NFS_NON_CONFIG = 0
|
||||
NFS_ENABLED = 1
|
||||
NFS_DISABLED = 2
|
||||
NFS_EXCEPTION = 3
|
||||
NFS_NON_SUPPORTED = 0
|
||||
NFS_SUPPORTED = 1
|
||||
|
||||
CIFS_SHARE_MODE = '2'
|
||||
CIFS_ENABLED = '1'
|
||||
CIFS_NON_CONFIG = '-1'
|
||||
CIFS_DISABLED = '-2'
|
||||
CIFS_EXCEPTION = '-3'
|
||||
|
||||
USER_NOT_EXIST = '0'
|
||||
USER_EXIST = '1'
|
||||
USER_FORMAT_ERROR = '2'
|
||||
|
||||
GROUP_NOT_EXIST = '0'
|
||||
GROUP_EXIST = '1'
|
||||
GROUP_FORMAT_ERROR = '2'
|
||||
|
||||
CODE_SUCCESS = 0
|
||||
CODE_NOT_FOUND = 4
|
||||
CODE_SOURCE_NOT_EXIST = 403
|
||||
|
||||
TOKEN_EXPIRED = 301
|
||||
TOKEN_VERIFY_FAILED = 302
|
||||
TOKEN_FORMAT_ERROR = 303
|
||||
TOKEN_REQUIRED = 304
|
||||
# Copyright (c) 2022 MacroSAN Technologies Co., Ltd.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
NFS_NON_CONFIG = 0
|
||||
NFS_ENABLED = 1
|
||||
NFS_DISABLED = 2
|
||||
NFS_EXCEPTION = 3
|
||||
NFS_NON_SUPPORTED = 0
|
||||
NFS_SUPPORTED = 1
|
||||
|
||||
CIFS_SHARE_MODE = '2'
|
||||
CIFS_ENABLED = '1'
|
||||
CIFS_NON_CONFIG = '-1'
|
||||
CIFS_DISABLED = '-2'
|
||||
CIFS_EXCEPTION = '-3'
|
||||
|
||||
USER_NOT_EXIST = '0'
|
||||
USER_EXIST = '1'
|
||||
USER_FORMAT_ERROR = '2'
|
||||
|
||||
GROUP_NOT_EXIST = '0'
|
||||
GROUP_EXIST = '1'
|
||||
GROUP_FORMAT_ERROR = '2'
|
||||
|
||||
CODE_SUCCESS = 0
|
||||
CODE_NOT_FOUND = 4
|
||||
CODE_SOURCE_NOT_EXIST = 403
|
||||
|
||||
TOKEN_EXPIRED = 301
|
||||
TOKEN_VERIFY_FAILED = 302
|
||||
TOKEN_FORMAT_ERROR = 303
|
||||
TOKEN_REQUIRED = 304
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,186 +1,186 @@
|
|||
# Copyright (c) 2022 MacroSAN Technologies Co., Ltd.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
"""
|
||||
Share driver for Macrosan Storage Array.
|
||||
"""
|
||||
|
||||
import functools
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log
|
||||
|
||||
from manila.share import driver
|
||||
from manila.share.drivers.macrosan import macrosan_helper
|
||||
|
||||
macrosan_opts = [
|
||||
cfg.HostAddressOpt('macrosan_nas_ip',
|
||||
required=True,
|
||||
help='IP address for the Macrosan NAS server.'),
|
||||
cfg.PortOpt('macrosan_nas_port',
|
||||
default=8443,
|
||||
help='Port number for the Macrosan NAS server.'),
|
||||
cfg.StrOpt('macrosan_nas_username',
|
||||
default='manila',
|
||||
help='Username for the Macrosan NAS server.'),
|
||||
cfg.StrOpt('macrosan_nas_password',
|
||||
default=None,
|
||||
secret=True,
|
||||
help='Password for the Macrosan NAS server.'),
|
||||
cfg.StrOpt('macrosan_nas_http_protocol',
|
||||
default='https',
|
||||
choices=['http', 'https'],
|
||||
help='Http protocol for the Macrosan NAS server.'),
|
||||
cfg.BoolOpt('macrosan_ssl_cert_verify',
|
||||
default=False,
|
||||
help='Defines whether the driver should check ssl cert.'),
|
||||
cfg.StrOpt('macrosan_nas_prefix',
|
||||
default='nas',
|
||||
help='Url prefix for the Macrosan NAS server.'),
|
||||
cfg.ListOpt('macrosan_share_pools',
|
||||
required=True,
|
||||
help='Comma separated list of Macrosan NAS pools.'),
|
||||
cfg.IntOpt('macrosan_timeout',
|
||||
default=60,
|
||||
help='request timeout in seconds.')
|
||||
]
|
||||
|
||||
CONF = cfg.CONF
|
||||
CONF.register_opts(macrosan_opts)
|
||||
LOG = log.getLogger(__name__)
|
||||
|
||||
|
||||
def debug_trace(func):
|
||||
"""Log the dirver invoke method start and leave information
|
||||
|
||||
Used in the MacrosanNasDriver class methods.
|
||||
Ensure func have 'self' argument.
|
||||
"""
|
||||
|
||||
@functools.wraps(func)
|
||||
def wrapper(*args, **kwargs):
|
||||
driver = args[0]
|
||||
method_name = "%(class_name)s.%(method)s" \
|
||||
% {"class_name": driver.__class__.__name__,
|
||||
"method": func.__name__}
|
||||
backend_name = driver.configuration.share_backend_name
|
||||
LOG.debug("[%(backend_name)s]:Start %(method_name)s",
|
||||
{"backend_name": backend_name, "method_name": method_name})
|
||||
result = func(*args, **kwargs)
|
||||
LOG.debug("[%(backend_name)s]:Leave %(method_name)s",
|
||||
{"backend_name": backend_name, "method_name": method_name})
|
||||
return result
|
||||
|
||||
return wrapper
|
||||
|
||||
|
||||
class MacrosanNasDriver(driver.ShareDriver):
|
||||
"""Macrosan Share Driver
|
||||
|
||||
Driver version history:
|
||||
V1.0.0: Initial version
|
||||
Driver support:
|
||||
share create/delete,
|
||||
extend size,
|
||||
shrink size,
|
||||
update_access.
|
||||
protocol: NFS/CIFS
|
||||
|
||||
"""
|
||||
|
||||
VENDOR = 'Macrosan'
|
||||
VERSION = '1.0.0'
|
||||
PROTOCOL = 'NFS_CIFS'
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(MacrosanNasDriver, self).__init__(False, *args, **kwargs)
|
||||
self.configuration.append_config_values(macrosan_opts)
|
||||
|
||||
self.helper = macrosan_helper.MacrosanHelper(self.configuration)
|
||||
|
||||
@debug_trace
|
||||
def do_setup(self, context):
|
||||
"""initialization the driver when start"""
|
||||
self.helper.do_setup()
|
||||
|
||||
@debug_trace
|
||||
def check_for_setup_error(self):
|
||||
"""Check prerequisites"""
|
||||
self.helper.check_share_service()
|
||||
|
||||
@debug_trace
|
||||
def create_share(self, context, share, share_server=None):
|
||||
"""Create a share"""
|
||||
return self.helper.create_share(share, share_server)
|
||||
|
||||
@debug_trace
|
||||
def delete_share(self, context, share, share_server=None):
|
||||
"""Delete a share."""
|
||||
self.helper.delete_share(share, share_server)
|
||||
|
||||
@debug_trace
|
||||
def extend_share(self, share, new_size, share_server=None):
|
||||
"""Extend share capacity"""
|
||||
self.helper.extend_share(share, new_size, share_server)
|
||||
|
||||
@debug_trace
|
||||
def shrink_share(self, share, new_size, share_server=None):
|
||||
"""Shrink share capacity"""
|
||||
self.helper.shrink_share(share, new_size, share_server)
|
||||
|
||||
@debug_trace
|
||||
def ensure_share(self, context, share, share_server=None):
|
||||
"""Enusre that share is exported."""
|
||||
return self.helper.ensure_share(share, share_server)
|
||||
|
||||
@debug_trace
|
||||
def update_access(self, context, share, access_rules, add_rules,
|
||||
delete_rules, share_server=None):
|
||||
"""Update access rules list.
|
||||
|
||||
:param context: Current context
|
||||
:param share: Share model with share data.
|
||||
:param access_rules: All access rules for given share
|
||||
:param add_rules: Empty List or List of access rules which should be
|
||||
added. access_rules already contains these rules.
|
||||
:param delete_rules: Empty List or List of access rules which should be
|
||||
removed. access_rules doesn't contain these rules.
|
||||
:param share_server: Not used by this driver.
|
||||
|
||||
:returns: None, or a dictionary of ``access_id``, ``access_key`` as
|
||||
key: value pairs for the rules added, where, ``access_id``
|
||||
is the UUID (string) of the access rule, and ``access_key``
|
||||
is the credential (string) of the entity granted access.
|
||||
During recovery after error, the returned dictionary must
|
||||
contain ``access_id``, ``access_key`` for all the rules that
|
||||
the driver is ordered to resync, i.e. rules in the
|
||||
``access_rules`` parameter.
|
||||
"""
|
||||
return self.helper.update_access(share, access_rules,
|
||||
add_rules, delete_rules,
|
||||
share_server)
|
||||
|
||||
@debug_trace
|
||||
def _update_share_stats(self):
|
||||
"""Update backend status ,include driver and pools"""
|
||||
|
||||
data = {
|
||||
'vendor_name': self.VENDOR,
|
||||
'driver_version': self.VERSION,
|
||||
'storage_protocol': self.PROTOCOL,
|
||||
'share_backend_name':
|
||||
self.configuration.safe_get('share_backend_name'),
|
||||
}
|
||||
self.helper.update_share_stats(data)
|
||||
super(MacrosanNasDriver, self)._update_share_stats(data)
|
||||
# Copyright (c) 2022 MacroSAN Technologies Co., Ltd.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
"""
|
||||
Share driver for Macrosan Storage Array.
|
||||
"""
|
||||
|
||||
import functools
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log
|
||||
|
||||
from manila.share import driver
|
||||
from manila.share.drivers.macrosan import macrosan_helper
|
||||
|
||||
macrosan_opts = [
|
||||
cfg.HostAddressOpt('macrosan_nas_ip',
|
||||
required=True,
|
||||
help='IP address for the Macrosan NAS server.'),
|
||||
cfg.PortOpt('macrosan_nas_port',
|
||||
default=8443,
|
||||
help='Port number for the Macrosan NAS server.'),
|
||||
cfg.StrOpt('macrosan_nas_username',
|
||||
default='manila',
|
||||
help='Username for the Macrosan NAS server.'),
|
||||
cfg.StrOpt('macrosan_nas_password',
|
||||
default=None,
|
||||
secret=True,
|
||||
help='Password for the Macrosan NAS server.'),
|
||||
cfg.StrOpt('macrosan_nas_http_protocol',
|
||||
default='https',
|
||||
choices=['http', 'https'],
|
||||
help='Http protocol for the Macrosan NAS server.'),
|
||||
cfg.BoolOpt('macrosan_ssl_cert_verify',
|
||||
default=False,
|
||||
help='Defines whether the driver should check ssl cert.'),
|
||||
cfg.StrOpt('macrosan_nas_prefix',
|
||||
default='nas',
|
||||
help='Url prefix for the Macrosan NAS server.'),
|
||||
cfg.ListOpt('macrosan_share_pools',
|
||||
required=True,
|
||||
help='Comma separated list of Macrosan NAS pools.'),
|
||||
cfg.IntOpt('macrosan_timeout',
|
||||
default=60,
|
||||
help='request timeout in seconds.')
|
||||
]
|
||||
|
||||
CONF = cfg.CONF
|
||||
CONF.register_opts(macrosan_opts)
|
||||
LOG = log.getLogger(__name__)
|
||||
|
||||
|
||||
def debug_trace(func):
|
||||
"""Log the dirver invoke method start and leave information
|
||||
|
||||
Used in the MacrosanNasDriver class methods.
|
||||
Ensure func have 'self' argument.
|
||||
"""
|
||||
|
||||
@functools.wraps(func)
|
||||
def wrapper(*args, **kwargs):
|
||||
driver = args[0]
|
||||
method_name = "%(class_name)s.%(method)s" \
|
||||
% {"class_name": driver.__class__.__name__,
|
||||
"method": func.__name__}
|
||||
backend_name = driver.configuration.share_backend_name
|
||||
LOG.debug("[%(backend_name)s]:Start %(method_name)s",
|
||||
{"backend_name": backend_name, "method_name": method_name})
|
||||
result = func(*args, **kwargs)
|
||||
LOG.debug("[%(backend_name)s]:Leave %(method_name)s",
|
||||
{"backend_name": backend_name, "method_name": method_name})
|
||||
return result
|
||||
|
||||
return wrapper
|
||||
|
||||
|
||||
class MacrosanNasDriver(driver.ShareDriver):
|
||||
"""Macrosan Share Driver
|
||||
|
||||
Driver version history:
|
||||
V1.0.0: Initial version
|
||||
Driver support:
|
||||
share create/delete,
|
||||
extend size,
|
||||
shrink size,
|
||||
update_access.
|
||||
protocol: NFS/CIFS
|
||||
|
||||
"""
|
||||
|
||||
VENDOR = 'Macrosan'
|
||||
VERSION = '1.0.0'
|
||||
PROTOCOL = 'NFS_CIFS'
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(MacrosanNasDriver, self).__init__(False, *args, **kwargs)
|
||||
self.configuration.append_config_values(macrosan_opts)
|
||||
|
||||
self.helper = macrosan_helper.MacrosanHelper(self.configuration)
|
||||
|
||||
@debug_trace
|
||||
def do_setup(self, context):
|
||||
"""initialization the driver when start"""
|
||||
self.helper.do_setup()
|
||||
|
||||
@debug_trace
|
||||
def check_for_setup_error(self):
|
||||
"""Check prerequisites"""
|
||||
self.helper.check_share_service()
|
||||
|
||||
@debug_trace
|
||||
def create_share(self, context, share, share_server=None):
|
||||
"""Create a share"""
|
||||
return self.helper.create_share(share, share_server)
|
||||
|
||||
@debug_trace
|
||||
def delete_share(self, context, share, share_server=None):
|
||||
"""Delete a share."""
|
||||
self.helper.delete_share(share, share_server)
|
||||
|
||||
@debug_trace
|
||||
def extend_share(self, share, new_size, share_server=None):
|
||||
"""Extend share capacity"""
|
||||
self.helper.extend_share(share, new_size, share_server)
|
||||
|
||||
@debug_trace
|
||||
def shrink_share(self, share, new_size, share_server=None):
|
||||
"""Shrink share capacity"""
|
||||
self.helper.shrink_share(share, new_size, share_server)
|
||||
|
||||
@debug_trace
|
||||
def ensure_share(self, context, share, share_server=None):
|
||||
"""Enusre that share is exported."""
|
||||
return self.helper.ensure_share(share, share_server)
|
||||
|
||||
@debug_trace
|
||||
def update_access(self, context, share, access_rules, add_rules,
|
||||
delete_rules, share_server=None):
|
||||
"""Update access rules list.
|
||||
|
||||
:param context: Current context
|
||||
:param share: Share model with share data.
|
||||
:param access_rules: All access rules for given share
|
||||
:param add_rules: Empty List or List of access rules which should be
|
||||
added. access_rules already contains these rules.
|
||||
:param delete_rules: Empty List or List of access rules which should be
|
||||
removed. access_rules doesn't contain these rules.
|
||||
:param share_server: Not used by this driver.
|
||||
|
||||
:returns: None, or a dictionary of ``access_id``, ``access_key`` as
|
||||
key: value pairs for the rules added, where, ``access_id``
|
||||
is the UUID (string) of the access rule, and ``access_key``
|
||||
is the credential (string) of the entity granted access.
|
||||
During recovery after error, the returned dictionary must
|
||||
contain ``access_id``, ``access_key`` for all the rules that
|
||||
the driver is ordered to resync, i.e. rules in the
|
||||
``access_rules`` parameter.
|
||||
"""
|
||||
return self.helper.update_access(share, access_rules,
|
||||
add_rules, delete_rules,
|
||||
share_server)
|
||||
|
||||
@debug_trace
|
||||
def _update_share_stats(self):
|
||||
"""Update backend status ,include driver and pools"""
|
||||
|
||||
data = {
|
||||
'vendor_name': self.VENDOR,
|
||||
'driver_version': self.VERSION,
|
||||
'storage_protocol': self.PROTOCOL,
|
||||
'share_backend_name':
|
||||
self.configuration.safe_get('share_backend_name'),
|
||||
}
|
||||
self.helper.update_share_stats(data)
|
||||
super(MacrosanNasDriver, self)._update_share_stats(data)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -992,6 +992,7 @@ test_create_nfs_share_batch:
|
|||
nfs_share: &nfs_share__test_create_nfs_share_batch
|
||||
_properties:
|
||||
name: '716100cc-e0b4-416b-ac27-d38dd019330d'
|
||||
size: 151081080
|
||||
|
||||
unity:
|
||||
_methods:
|
||||
|
|
@ -1005,11 +1006,6 @@ test_create_nfs_share_batch:
|
|||
_properties:
|
||||
<<: *nas_server_prop
|
||||
|
||||
nfs_share:
|
||||
_properties:
|
||||
name: '716100cc-e0b4-416b-ac27-d38dd019330d'
|
||||
size: 151081080
|
||||
|
||||
test_get_share_with_invalid_proto:
|
||||
share:
|
||||
_properties:
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -6,9 +6,9 @@ deprecations:
|
|||
the ``[DEFAULT]`` section. The existing options in the ``[DEFAULT]``
|
||||
section have been deprecated and will be removed in a future release.
|
||||
Options that have changed in this releases are:
|
||||
|
||||
- ``[quota]/shares`` - previously ``[DEFAULT]/shares_quota``
|
||||
- ``[quota]/snapshots`` - previously ``[DEFAULT]/snapshots_quota``
|
||||
|
||||
- ``[quota]/shares`` - previously ``[DEFAULT]/shares_quota``
|
||||
- ``[quota]/snapshots`` - previously ``[DEFAULT]/snapshots_quota``
|
||||
- ``[quota]/gigabytes`` - previously ``[DEFAULT]/quota_gigabytes``
|
||||
- ``[quota]/per_share_gigabytes`` - previously ``[DEFAULT]/quota_per_share_gigabytes``
|
||||
- ``[quota]/snapshot_gigabytes`` - previously ``[DEFAULT]/quota_snapshot_gigabytes``
|
||||
|
|
|
|||
0
releasenotes/notes/bug-1721787-fix-getting-share-networks-and-security-services-error-7e5e7981fcbf2b53.yaml
Executable file → Normal file
0
releasenotes/notes/bug-1721787-fix-getting-share-networks-and-security-services-error-7e5e7981fcbf2b53.yaml
Executable file → Normal file
|
|
@ -1,11 +1,11 @@
|
|||
---
|
||||
prelude: >
|
||||
Add a new EMC Unity plugin in manila which allows user to create NFS/CIFS
|
||||
share with an EMC Unity backend.
|
||||
features:
|
||||
- |
|
||||
Add a new Unity plugin in manila which allows user to create NFS/CIFS
|
||||
share with an EMC Unity backend. This plugin performs the operations on
|
||||
Unity by REST API.
|
||||
issues:
|
||||
- EMC Unity does not support the same IP in different VLANs.
|
||||
---
|
||||
prelude: >
|
||||
Add a new EMC Unity plugin in manila which allows user to create NFS/CIFS
|
||||
share with an EMC Unity backend.
|
||||
features:
|
||||
- |
|
||||
Add a new Unity plugin in manila which allows user to create NFS/CIFS
|
||||
share with an EMC Unity backend. This plugin performs the operations on
|
||||
Unity by REST API.
|
||||
issues:
|
||||
- EMC Unity does not support the same IP in different VLANs.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
features:
|
||||
- Add support for reporting pool disk type in Huawei driver.
|
||||
`huawei_disk_type` extra-spec in the share type. Valid values
|
||||
for this extra-spec are 'ssd', 'sas', 'nl_sas' or 'mix'.
|
||||
---
|
||||
features:
|
||||
- Add support for reporting pool disk type in Huawei driver.
|
||||
`huawei_disk_type` extra-spec in the share type. Valid values
|
||||
for this extra-spec are 'ssd', 'sas', 'nl_sas' or 'mix'.
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ features:
|
|||
approach and new REST client. It is default to `True`, meaning that the
|
||||
drivers will keep working as before using ZAPI operations. If desired, this
|
||||
option can be set to `False` connecting with new REST client that performs
|
||||
REST API operations if it is available, otherwise falls back to ZAPI.
|
||||
|
||||
REST API operations if it is available, otherwise falls back to ZAPI.
|
||||
|
||||
Also, an option called `netapp_rest_operation_timeout` was added to allow
|
||||
the user to set the maximum amount of time expected to get an output from
|
||||
a synchronous operation when using REST API. By default, the timeout value
|
||||
|
|
|
|||
|
|
@ -17,4 +17,4 @@ upgrade:
|
|||
``emc_nas_server_container``, ``emc_nas_pool_names`` and
|
||||
``emc_interface_ports`` can no longer be used. They must be replaced by
|
||||
``powermax_server_container``, ``powermax_share_data_pools`` and
|
||||
``powermax_ethernet_ports`` respectively.
|
||||
``powermax_ethernet_ports`` respectively.
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@ upgrade:
|
|||
in the ZFSonLinux driver. Now, the operator using the ZFSonLinux driver
|
||||
can create a share from snapshot in different pools or backends by
|
||||
specifying the Manila API configuration option
|
||||
[DEFAULT]/use_scheduler_creating_share_from_snapshot.
|
||||
[DEFAULT]/use_scheduler_creating_share_from_snapshot.
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ DB_ROOT_PW=${POSTGRES_ROOT_PW:-insecure_slave}
|
|||
|
||||
# Setup user
|
||||
root_roles=$(sudo -H -u postgres psql -t -c "
|
||||
SELECT 'HERE' from pg_roles where rolname='$DB_USER'")
|
||||
SELECT 'HERE' from pg_roles where rolname='$DB_USER'")
|
||||
if [[ ${root_roles} == *HERE ]];then
|
||||
sudo -H -u postgres psql -c "ALTER ROLE $DB_USER WITH SUPERUSER LOGIN PASSWORD '$DB_PW'"
|
||||
else
|
||||
|
|
|
|||
Loading…
Reference in New Issue