Browse Source

[trac736] two minor fixes to remoteConfig handling

Jelte Jansen 14 years ago
parent
commit
78fa7f965c
2 changed files with 6 additions and 9 deletions
  1. 5 8
      src/lib/config/ccsession.cc
  2. 1 1
      src/lib/python/isc/config/cfgmgr.py

+ 5 - 8
src/lib/config/ccsession.cc

@@ -377,14 +377,11 @@ ModuleCCSession::fetchRemoteSpec(const std::string& module, bool is_filename) {
         return (readModuleSpecification(module));
     } else {
         // It's module name, request it from config manager
-
-        // Send the command
-        ConstElementPtr cmd(createCommand("get_module_spec",
-                            Element::fromJSON("{\"module_name\": \"" + module +
-                                              "\"}")));
-        const unsigned int seq = session_.group_sendmsg(cmd, "ConfigManager");
-
-        // Wait for the answer
+        ConstElementPtr cmd = Element::fromJSON("{ \"command\": ["
+                                                "\"get_module_spec\","
+                                                "{\"module_name\": \"" + 
+                                                spec_name + "\"} ] }");
+        unsigned int seq = session_.group_sendmsg(cmd, "ConfigManager");
         ConstElementPtr env, answer;
         session_.group_recvmsg(env, answer, false, seq);
         int rcode;

+ 1 - 1
src/lib/python/isc/config/cfgmgr.py

@@ -214,7 +214,7 @@ class ConfigManager:
            is returned"""
         if module_name:
             if module_name in self.module_specs:
-                return self.module_specs[module_name]
+                return self.module_specs[module_name].get_full_spec()
             else:
                 # TODO: log error?
                 return {}