Merge pull request privacyidea#1809 from privacyidea/1807/pi-manage-c…

…reate-policy

Use name from policy definition file

pi-manage

@@ -1153,6 +1153,14 @@ def create(name, scope, action, filename=None):
 
             params = ast.literal_eval(contents)
 
+            if params.get("name") and params.get("name") != name:
+                print("Found name '{0!s}' in file, will use that instead of "
+                      "'{1!s}'.".format(params.get("name"), name))
+            else:
+                print("name not defined in file, will use the cli value "
+                      "{0!s}.".format(name))
+                params["scope"] = name
+
             if params.get("scope") and params.get("scope") != scope:
                 print("Found scope '{0!s}' in file, will use that instead of "
                       "'{1!s}'.".format(params.get("scope"), scope))
@@ -1169,7 +1177,8 @@ def create(name, scope, action, filename=None):
                       "{0!s}.".format(action))
                 params["action"] = action
 
-            r = set_policy(name, scope=params.get("scope"),
+            r = set_policy(params.get("name"),
+                           scope=params.get("scope"),
                            action=params.get("action"),
                            realm=params.get("realm"),
                            resolver=params.get("resolver"),