fix cinder, nova name mapping

auhlig · auhlig · commit 0e192c9cc31d · 2018-08-06T12:13:03.000-04:00
diff --git a/watcher/target_type_uri_strategy.py b/watcher/target_type_uri_strategy.py
@@ -224,6 +224,7 @@ def __init__(self):
         }
         regex_mapping = {
             'flavors/[^/|$]+': 'flavors/flavor',
+            'servers/[^/|$]+': 'servers/server',
         }
         super(NovaTargetTypeURIStrategy, self).__init__(
             name='nova',
@@ -267,10 +268,14 @@ def __init__(self):
             'os-quota-class-sets': 'class',
             'os-quota-sets': 'quota',
         }
+        regex_mapping = {
+            'volumes/[^/|$]+': 'volumes/volume',
+        }
         super(CinderTargetTypeURIStrategy, self).__init__(
             name='cinder',
             prefix='service/storage/block',
-            mapping=mapping
+            mapping=mapping,
+            regex_mapping=regex_mapping
         )
 
 

Original file line number	Diff line number	Diff line change
`@@ -224,6 +224,7 @@ def __init__(self):`
`224`	`224`	`}`
`225`	`225`	`regex_mapping = {`
`226`	`226`	`'flavors/[^/\|$]+': 'flavors/flavor',`
	`227`	`+ 'servers/[^/\|$]+': 'servers/server',`
`227`	`228`	`}`
`228`	`229`	`super(NovaTargetTypeURIStrategy, self).__init__(`
`229`	`230`	`name='nova',`
`@@ -267,10 +268,14 @@ def __init__(self):`
`267`	`268`	`'os-quota-class-sets': 'class',`
`268`	`269`	`'os-quota-sets': 'quota',`
`269`	`270`	`}`
	`271`	`+ regex_mapping = {`
	`272`	`+ 'volumes/[^/\|$]+': 'volumes/volume',`
	`273`	`+ }`
`270`	`274`	`super(CinderTargetTypeURIStrategy, self).__init__(`
`271`	`275`	`name='cinder',`
`272`	`276`	`prefix='service/storage/block',`
`273`		`- mapping=mapping`
	`277`	`+ mapping=mapping,`
	`278`	`+ regex_mapping=regex_mapping`
`274`	`279`	`)`
`275`	`280`
`276`	`281`