Revision 69237e6e snf-cyclades-app/synnefo/quotas/tests.py

b/snf-cyclades-app/synnefo/quotas/tests.py
86 86
        holdings = util.get_db_holdings(user="user3")
87 87
        self.assertEqual(holdings, user_holdings)
88 88

  
89

  
90 89
    def test_network_holdings(self):
91 90
        mfactory.NetworkFactory(userid="user1")
92 91
        mfactory.NetworkFactory(userid="user2")
......
97 96
        self.assertEqual(holdings["user2"], user_holdings["user2"])
98 97

  
99 98
    def test_floating_ip_holdings(self):
100
        mfactory.IPAddressFactory(userid="user1")
101
        mfactory.IPAddressFactory(userid="user1")
102
        mfactory.IPAddressFactory(userid="user2")
103
        mfactory.IPAddressFactory(userid="user3")
99
        mfactory.IPv4AddressFactory(userid="user1", floating_ip=True)
100
        mfactory.IPv4AddressFactory(userid="user1", floating_ip=True)
101
        mfactory.IPv4AddressFactory(userid="user2", floating_ip=True)
102
        mfactory.IPv4AddressFactory(userid="user3", floating_ip=True)
104 103
        holdings = util.get_db_holdings()
105 104
        self.assertEqual(holdings["user1"]["cyclades.floating_ip"], 2)
106 105
        self.assertEqual(holdings["user2"]["cyclades.floating_ip"], 1)
......
176 175
        self.assertEqual(None, commission)
177 176
        commission = quotas.get_commission_info(vm, "RESIZE",
178 177
                                                {"beparams": {"vcpus": 4,
179
                                                              "maxmem":2048}})
178
                                                              "maxmem": 2048}})
180 179
        self.assertEqual({"cyclades.cpu": 2,
181 180
                          "cyclades.ram": 1048576 * 1024}, commission)
182 181
        vm.operstate = "STOPPED"

Also available in: Unified diff