Managedblockchain member additions (#2983)

* Added some member and proposal functions

* Added additional member and proposal functions

* Fixed admin password return and added update_member along with tests

* Added network removal and member removal proposal

* Fixed failing test

* Fixed Python 2.7 test

tests/test_managedblockchain/test_managedblockchain_networks.py

@@ -5,28 +5,7 @@ import sure  # noqa
 
 from moto.managedblockchain.exceptions import BadRequestException
 from moto import mock_managedblockchain
-
-
-default_frameworkconfiguration = {"Fabric": {"Edition": "STARTER"}}
-
-default_votingpolicy = {
-    "ApprovalThresholdPolicy": {
-        "ThresholdPercentage": 50,
-        "ProposalDurationInHours": 24,
-        "ThresholdComparator": "GREATER_THAN_OR_EQUAL_TO",
-    }
-}
-
-default_memberconfiguration = {
-    "Name": "testmember1",
-    "Description": "Test Member 1",
-    "FrameworkConfiguration": {
-        "Fabric": {"AdminUsername": "admin", "AdminPassword": "Admin12345"}
-    },
-    "LogPublishingConfiguration": {
-        "Fabric": {"CaLogs": {"Cloudwatch": {"Enabled": False}}}
-    },
-}
+from . import helpers
 
 
 @mock_managedblockchain
@@ -37,12 +16,14 @@ def test_create_network():
         Name="testnetwork1",
         Framework="HYPERLEDGER_FABRIC",
         FrameworkVersion="1.2",
-        FrameworkConfiguration=default_frameworkconfiguration,
-        VotingPolicy=default_votingpolicy,
-        MemberConfiguration=default_memberconfiguration,
+        FrameworkConfiguration=helpers.default_frameworkconfiguration,
+        VotingPolicy=helpers.default_votingpolicy,
+        MemberConfiguration=helpers.default_memberconfiguration,
     )
-    response["NetworkId"].should.match("n-[A-Z0-9]{26}")
-    response["MemberId"].should.match("m-[A-Z0-9]{26}")
+    network_id = response["NetworkId"]
+    member_id = response["MemberId"]
+    network_id.should.match("n-[A-Z0-9]{26}")
+    member_id.should.match("m-[A-Z0-9]{26}")
 
     # Find in full list
     response = conn.list_networks()
@@ -51,7 +32,6 @@ def test_create_network():
     mbcnetworks[0]["Name"].should.equal("testnetwork1")
 
     # Get network details
-    network_id = mbcnetworks[0]["Id"]
     response = conn.get_network(NetworkId=network_id)
     response["Network"]["Name"].should.equal("testnetwork1")
 
@@ -65,12 +45,14 @@ def test_create_network_withopts():
         Description="Test Network 1",
         Framework="HYPERLEDGER_FABRIC",
         FrameworkVersion="1.2",
-        FrameworkConfiguration=default_frameworkconfiguration,
-        VotingPolicy=default_votingpolicy,
-        MemberConfiguration=default_memberconfiguration,
+        FrameworkConfiguration=helpers.default_frameworkconfiguration,
+        VotingPolicy=helpers.default_votingpolicy,
+        MemberConfiguration=helpers.default_memberconfiguration,
     )
-    response["NetworkId"].should.match("n-[A-Z0-9]{26}")
-    response["MemberId"].should.match("m-[A-Z0-9]{26}")
+    network_id = response["NetworkId"]
+    member_id = response["MemberId"]
+    network_id.should.match("n-[A-Z0-9]{26}")
+    member_id.should.match("m-[A-Z0-9]{26}")
 
     # Find in full list
     response = conn.list_networks()
@@ -79,7 +61,6 @@ def test_create_network_withopts():
     mbcnetworks[0]["Description"].should.equal("Test Network 1")
 
     # Get network details
-    network_id = mbcnetworks[0]["Id"]
     response = conn.get_network(NetworkId=network_id)
     response["Network"]["Description"].should.equal("Test Network 1")
 
@@ -93,9 +74,9 @@ def test_create_network_noframework():
         Description="Test Network 1",
         Framework="HYPERLEDGER_VINYL",
         FrameworkVersion="1.2",
-        FrameworkConfiguration=default_frameworkconfiguration,
-        VotingPolicy=default_votingpolicy,
-        MemberConfiguration=default_memberconfiguration,
+        FrameworkConfiguration=helpers.default_frameworkconfiguration,
+        VotingPolicy=helpers.default_votingpolicy,
+        MemberConfiguration=helpers.default_memberconfiguration,
     ).should.throw(Exception, "Invalid request body")
 
 
@@ -108,9 +89,9 @@ def test_create_network_badframeworkver():
         Description="Test Network 1",
         Framework="HYPERLEDGER_FABRIC",
         FrameworkVersion="1.X",
-        FrameworkConfiguration=default_frameworkconfiguration,
-        VotingPolicy=default_votingpolicy,
-        MemberConfiguration=default_memberconfiguration,
+        FrameworkConfiguration=helpers.default_frameworkconfiguration,
+        VotingPolicy=helpers.default_votingpolicy,
+        MemberConfiguration=helpers.default_memberconfiguration,
     ).should.throw(
         Exception, "Invalid version 1.X requested for framework HYPERLEDGER_FABRIC"
     )
@@ -128,8 +109,8 @@ def test_create_network_badedition():
         Framework="HYPERLEDGER_FABRIC",
         FrameworkVersion="1.2",
         FrameworkConfiguration=frameworkconfiguration,
-        VotingPolicy=default_votingpolicy,
-        MemberConfiguration=default_memberconfiguration,
+        VotingPolicy=helpers.default_votingpolicy,
+        MemberConfiguration=helpers.default_memberconfiguration,
     ).should.throw(Exception, "Invalid request body")
 
 
@@ -138,5 +119,5 @@ def test_get_network_badnetwork():
     conn = boto3.client("managedblockchain", region_name="us-east-1")
 
     response = conn.get_network.when.called_with(
-        NetworkId="n-BADNETWORK",
-    ).should.throw(Exception, "Network n-BADNETWORK not found")
+        NetworkId="n-ABCDEFGHIJKLMNOP0123456789",
+    ).should.throw(Exception, "Network n-ABCDEFGHIJKLMNOP0123456789 not found")