Revision 340ae7da test/ganeti.tools.prepare_node_join_unittest.py

b/test/ganeti.tools.prepare_node_join_unittest.py
159 159

  
160 160
    self.keyfiles = {
161 161
      constants.SSHK_RSA:
162
        (utils.PathJoin(self.tmpdir, "rsa.public"),
163
         utils.PathJoin(self.tmpdir, "rsa.private")),
162
        (utils.PathJoin(self.tmpdir, "rsa.private"),
163
         utils.PathJoin(self.tmpdir, "rsa.public")),
164 164
      constants.SSHK_DSA:
165
        (utils.PathJoin(self.tmpdir, "dsa.public"),
166
         utils.PathJoin(self.tmpdir, "dsa.private")),
165
        (utils.PathJoin(self.tmpdir, "dsa.private"),
166
         utils.PathJoin(self.tmpdir, "dsa.public")),
167 167
      }
168 168

  
169 169
  def tearDown(self):
......
190 190
  def testDryRunRsa(self):
191 191
    self._TestDryRun({
192 192
      constants.SSHS_SSH_HOST_KEY: [
193
        (constants.SSHK_RSA, "rsapub", "rsapriv"),
193
        (constants.SSHK_RSA, "rsapriv", "rsapub"),
194 194
        ],
195 195
      })
196 196

  
197 197
  def testDryRunDsa(self):
198 198
    self._TestDryRun({
199 199
      constants.SSHS_SSH_HOST_KEY: [
200
        (constants.SSHK_DSA, "dsapub", "dsapriv"),
200
        (constants.SSHK_DSA, "dsapriv", "dsapub"),
201 201
        ],
202 202
      })
203 203

  
......
215 215
  def _TestUpdate(self, failcmd):
216 216
    data = {
217 217
      constants.SSHS_SSH_HOST_KEY: [
218
        (constants.SSHK_DSA, "dsapub", "dsapriv"),
219
        (constants.SSHK_RSA, "rsapub", "rsapriv"),
218
        (constants.SSHK_DSA, "dsapriv", "dsapub"),
219
        (constants.SSHK_RSA, "rsapriv", "rsapub"),
220 220
        ],
221 221
      }
222 222
    runcmd_fn = compat.partial(self._RunCmd, failcmd)
......
228 228
      prepare_node_join.UpdateSshDaemon(data, False, _runcmd_fn=runcmd_fn,
229 229
                                        _keyfiles=self.keyfiles)
230 230
    self.assertEqual(sorted(os.listdir(self.tmpdir)), sorted([
231
      "rsa.private", "rsa.public",
232
      "dsa.private", "dsa.public",
231
      "rsa.public", "rsa.private",
232
      "dsa.public", "dsa.private",
233 233
      ]))
234 234
    self.assertEqual(utils.ReadFile(utils.PathJoin(self.tmpdir, "rsa.public")),
235 235
                     "rsapub")
......
287 287
  def testUpdate(self):
288 288
    data = {
289 289
      constants.SSHS_SSH_ROOT_KEY: [
290
        (constants.SSHK_DSA, "ssh-dss pubdsa", "privatedsa"),
290
        (constants.SSHK_DSA, "privatedsa", "ssh-dss pubdsa"),
291 291
        ]
292 292
      }
293 293

  

Also available in: Unified diff