Revision 7bc909c7 snf-cyclades-app/synnefo/quotas/tests.py

b/snf-cyclades-app/synnefo/quotas/tests.py
55 55
        mfactory.VirtualMachineFactory()
56 56
        mfactory.VirtualMachineFactory(flavor=flavor, userid="user1",
57 57
                                       operstate="BUILD")
58
        user_holdings = {"user1": {"cyclades.vm": 1,
59
                                   "cyclades.total_cpu": 24,
60
                                   "cyclades.cpu": 24,
61
                                   "cyclades.disk": 21474836480,
62
                                   "cyclades.total_ram": 8589934592,
63
                                   "cyclades.ram": 8589934592}}
58
        user_holdings = {"user1": {None:
59
                                       {"cyclades.vm": 1,
60
                                        "cyclades.total_cpu": 24,
61
                                        "cyclades.cpu": 24,
62
                                        "cyclades.disk": 21474836480,
63
                                        "cyclades.total_ram": 8589934592,
64
                                        "cyclades.ram": 8589934592}}}
64 65
        holdings = util.get_db_holdings(user="user1")
65 66
        self.assertEqual(holdings, user_holdings)
66 67
        holdings = util.get_db_holdings()
......
69 70
        ##
70 71
        mfactory.VirtualMachineFactory(flavor=flavor, userid="user2",
71 72
                                       operstate="STARTED")
72
        user_holdings = {"user2": {"cyclades.vm": 1,
73
                                   "cyclades.total_cpu": 24,
74
                                   "cyclades.cpu": 24,
75
                                   "cyclades.disk": 21474836480,
76
                                   "cyclades.total_ram": 8589934592,
77
                                   "cyclades.ram": 8589934592}}
73
        user_holdings = {"user2": {None: {"cyclades.vm": 1,
74
                                          "cyclades.total_cpu": 24,
75
                                          "cyclades.cpu": 24,
76
                                          "cyclades.disk": 21474836480,
77
                                          "cyclades.total_ram": 8589934592,
78
                                          "cyclades.ram": 8589934592}}}
78 79
        holdings = util.get_db_holdings(user="user2")
79 80
        self.assertEqual(holdings, user_holdings)
80 81
        mfactory.VirtualMachineFactory(flavor=flavor, userid="user3",
81 82
                                       operstate="STOPPED")
82
        user_holdings = {"user3": {"cyclades.vm": 1,
83
                                   "cyclades.total_cpu": 24,
84
                                   "cyclades.disk": 21474836480,
85
                                   "cyclades.total_ram": 8589934592}}
83
        user_holdings = {"user3": {None: {"cyclades.vm": 1,
84
                                          "cyclades.total_cpu": 24,
85
                                          "cyclades.disk": 21474836480,
86
                                          "cyclades.total_ram": 8589934592}}}
86 87
        holdings = util.get_db_holdings(user="user3")
87 88
        self.assertEqual(holdings, user_holdings)
88 89

  
89 90
    def test_network_holdings(self):
90 91
        mfactory.NetworkFactory(userid="user1")
91 92
        mfactory.NetworkFactory(userid="user2")
92
        user_holdings = {"user2": {"cyclades.network.private": 1}}
93
        user_holdings = {"user2": {None: {"cyclades.network.private": 1}}}
93 94
        holdings = util.get_db_holdings(user="user2")
94 95
        self.assertEqual(holdings, user_holdings)
95 96
        holdings = util.get_db_holdings()
......
101 102
        mfactory.IPv4AddressFactory(userid="user2", floating_ip=True)
102 103
        mfactory.IPv4AddressFactory(userid="user3", floating_ip=True)
103 104
        holdings = util.get_db_holdings()
104
        self.assertEqual(holdings["user1"]["cyclades.floating_ip"], 2)
105
        self.assertEqual(holdings["user2"]["cyclades.floating_ip"], 1)
106
        self.assertEqual(holdings["user3"]["cyclades.floating_ip"], 1)
105
        self.assertEqual(holdings["user1"][None]["cyclades.floating_ip"], 2)
106
        self.assertEqual(holdings["user2"][None]["cyclades.floating_ip"], 1)
107
        self.assertEqual(holdings["user3"][None]["cyclades.floating_ip"], 1)
107 108

  
108 109

  
109 110
@patch("synnefo.quotas.get_quotaholder_pending")

Also available in: Unified diff